Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -r3c2bc6419b5796c03a7e4943938055c4ac36c24b -r81d219cfd75d97cdcb265d1233318f5ac3e6b373 --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 3c2bc6419b5796c03a7e4943938055c4ac36c24b) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 81d219cfd75d97cdcb265d1233318f5ac3e6b373) @@ -219,7 +219,7 @@ MSG_ID_TD_DRY_BICARD_DISCONNECT_DATA = 0xC4 MSG_ID_UI_DRY_BICARD_DISCONNECT_REQUEST = 0xC5 MSG_ID_TD_DRY_BICARD_DISCONNECT_RESPONSE = 0xC6 - MSG_ID_DD_NVM_CAL_CONC_PUMP_RESPONSE = 0xC7 + MSG_ID_TD_PRIME_PROGRESS_DATA = 0xC7 MSG_ID_UI_DD_NVM_SET_CAL_CONC_PUMP_REQUEST = 0xC8 MSG_ID_DD_NVM_CAL_D12_PUMP_RESPONSE = 0xC9 MSG_ID_UI_DD_NVM_SET_CAL_D12_PUMP_REQUEST = 0xCA Index: leahi_dialin/dd/modules/balancing_chamber.py =================================================================== diff -u -r6caa49d072aceb2655d605de5d2eea52ab1a8911 -r81d219cfd75d97cdcb265d1233318f5ac3e6b373 --- leahi_dialin/dd/modules/balancing_chamber.py (.../balancing_chamber.py) (revision 6caa49d072aceb2655d605de5d2eea52ab1a8911) +++ leahi_dialin/dd/modules/balancing_chamber.py (.../balancing_chamber.py) (revision 81d219cfd75d97cdcb265d1233318f5ac3e6b373) @@ -60,6 +60,19 @@ self.dd_bal_chamber_timestamp = 0 #: The timestamp of the last message self.handler_execution_times = [] + # Temp balancing chamber Debugging published fields + self.detectTolCount = 0.0 + self.maxDetectCount = 0.0 + self.minDetectCount = 0.0 + self.isDetectionInCountWindow = 0.0 + self.riseDeltaPsi = 0.0 + self.riseHit = 0.0 + self.requiredRiseCount = 0.0 + self.spentFillRiseHitCount = 0.0 + self.lastPrevSpentDialPressure = 0.0 + self.prevSpentDialPressure = 0.0 + + # ============================================================ Properties ============================================================ @property def execution_state(self) -> int: @@ -164,24 +177,35 @@ "is_spent_fill_complete", "current_bal_chamber_switching_counter", "is_pressure_stabilized_during_fill", "bal_chamber_switch_only_state", - "is_bal_chamber_switching_active", "dd_bal_chamber_timestamp"]) + "is_bal_chamber_switching_active", "dd_bal_chamber_timestamp", + "detectTolCount","maxDetectCount","minDetectCount","isDetectionInCountWindow","riseDeltaPsi","riseHit", + "requiredRiseCount","spentFillRiseHitCount","lastPrevSpentDialPressure","prevSpentDialPressure"]) def _handler_balancing_chamber_sync(self, message, timestamp=0.0): """ Handles published balancing chamber data messages. @param message: published balancing chamber data message @return: None """ - start = time.perf_counter() msg_list = [] - msg_list.append((type(self).execution_state, DataTypes.U32)) - msg_list.append((type(self).switching_state, DataTypes.U32)) - msg_list.append((type(self).switching_frequency, DataTypes.F32)) - msg_list.append((type(self).is_spent_fill_complete, DataTypes.BOOL)) - msg_list.append((type(self).current_bal_chamber_switching_counter, DataTypes.U32)) - msg_list.append((type(self).is_pressure_stabilized_during_fill, DataTypes.BOOL)) - msg_list.append((type(self).bal_chamber_switch_only_state, DataTypes.BOOL)) - msg_list.append((type(self).is_bal_chamber_switching_active, DataTypes.BOOL)) + msg_list.append(('self.execution_state', DataTypes.U32)) + msg_list.append(('self.switching_state', DataTypes.U32)) + msg_list.append(('self.switching_frequency', DataTypes.F32)) + msg_list.append(('self.is_spent_fill_complete', DataTypes.U32)) + msg_list.append(('self.current_bal_chamber_switching_counter', DataTypes.U32)) + msg_list.append(('self.is_pressure_stabilized_during_fill', DataTypes.U32)) + msg_list.append(('self.bal_chamber_switch_only_state', DataTypes.U32)) + msg_list.append(('self.is_bal_chamber_switching_active', DataTypes.U32)) + msg_list.append(('self.detectTolCount', DataTypes.U32)) + msg_list.append(('self.maxDetectCount', DataTypes.U32)) + msg_list.append(('self.minDetectCount', DataTypes.U32)) + msg_list.append(('self.isDetectionInCountWindow', DataTypes.U32)) + msg_list.append(('self.riseDeltaPsi', DataTypes.F32)) + msg_list.append(('self.riseHit', DataTypes.U32)) + msg_list.append(('self.requiredRiseCount', DataTypes.U32)) + msg_list.append(('self.spentFillRiseHitCount', DataTypes.U32)) + msg_list.append(('self.lastPrevSpentDialPressure', DataTypes.F32)) + msg_list.append(('self.prevSpentDialPressure', DataTypes.F32)) self.process_into_vars(decoder_list = msg_list, message = message) self.dd_bal_chamber_timestamp = timestamp