Index: leahi_dialin/dd/modules/balancing_chamber.py =================================================================== diff -u -rba415df9f8e76d6b0f21e8f69ba99346e42f7b09 -r441ce27db7bff8330b036f9cb2052574691e62e3 --- leahi_dialin/dd/modules/balancing_chamber.py (.../balancing_chamber.py) (revision ba415df9f8e76d6b0f21e8f69ba99346e42f7b09) +++ leahi_dialin/dd/modules/balancing_chamber.py (.../balancing_chamber.py) (revision 441ce27db7bff8330b036f9cb2052574691e62e3) @@ -59,7 +59,19 @@ self.is_bal_chamber_switching_active = False self.dd_bal_chamber_timestamp = 0 #: The timestamp of the last message + # 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,7 +176,9 @@ "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. @@ -173,14 +187,24 @@ @return: None """ 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