Index: leahi_dialin/dd/modules/balancing_chamber.py =================================================================== diff -u -rf1b8b4e9558e9cb95b994044f1d7d247c6c8be3f -r71a56766cee4274be927c6667123ccd396b1168d --- leahi_dialin/dd/modules/balancing_chamber.py (.../balancing_chamber.py) (revision f1b8b4e9558e9cb95b994044f1d7d247c6c8be3f) +++ leahi_dialin/dd/modules/balancing_chamber.py (.../balancing_chamber.py) (revision 71a56766cee4274be927c6667123ccd396b1168d) @@ -49,22 +49,21 @@ message_id = MsgIds.MSG_ID_DD_BAL_CHAMBER_DATA.value, function = self._handler_balancing_chamber_sync) - self.execution_state = 0 #: The Execution state - self.switching_state = 0 #: The Switching state - self.switching_frequency = 0.0 #: The Switching frequency of the balancing chamber - self.switching_period = 0 #: The Switching period in ms - self.bal_chamber_fill_in_progress = 0 #: The Balancing chamber's fill in progress - self.current_bal_chamber_switching_counter = 0 #: The Balancing Chamber's switching counter - self.is_pressure_stabilized_during_fill = 0 #: Is pressure stabilized during fill or not - self.bal_chamber_switch_only_state = 0 #: The Balancing Chamber's switch only state - self.is_bal_chamber_switching_active = 0 #: Is Balancing Chamber Switching Active + self.execution_state = 0 #: balChamberExecState + self.switching_state = 0 #: balChamberSWState + self.switching_frequency = 0.0 #: balChamberSWFreq + self.is_spent_fill_complete = 0 #: isSpentFillComplete + self.current_bal_chamber_switching_counter = 0 #: currentBalChamberSwitchingCounter + self.is_pressure_stabilized_during_fill = 0 #: isPressureStabilizedDuringFill + self.bal_chamber_switch_only_state = 0 #: balChamberSWOnlyState + self.is_bal_chamber_switching_active = 0 #: isBalChamberSwitchingActive self.dd_bal_chamber_timestamp = 0 #: The timestamp of the last message @publish(["msg_id_dd_bal_chamber_data", "execution_state", "switching_state", "switching_frequency", - "switching_period", "bal_chamber_fill_in_progress", + "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"]) @@ -79,8 +78,7 @@ 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.switching_period', DataTypes.U32)) - msg_list.append(('self.bal_chamber_fill_in_progress', DataTypes.U32)) + 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))