Index: leahi_dialin/dd/modules/balancing_chamber.py =================================================================== diff -u -r5c1132f5aadff6082afa56588ad1f4a64f828cd9 -rcb6c96886e5312796a48df6b1ec99329eb3fcee3 --- leahi_dialin/dd/modules/balancing_chamber.py (.../balancing_chamber.py) (revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9) +++ leahi_dialin/dd/modules/balancing_chamber.py (.../balancing_chamber.py) (revision cb6c96886e5312796a48df6b1ec99329eb3fcee3) @@ -52,19 +52,18 @@ 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.is_spent_fill_complete = 0 #: Is Spent fill complete or not 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.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.dd_bal_chamber_timestamp = 0 #: The timestamp of the last message self.handler_execution_times = [] @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"]) @@ -80,8 +79,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))