Index: leahi_dialin/dd/modules/mixing_cntrl.py =================================================================== diff -u -r74affa1ef5c98ee0ecf7d9f854b090ea23ee0054 -re412f48fe7363639f8e729d2274501ec02d51aa9 --- leahi_dialin/dd/modules/mixing_cntrl.py (.../mixing_cntrl.py) (revision 74affa1ef5c98ee0ecf7d9f854b090ea23ee0054) +++ leahi_dialin/dd/modules/mixing_cntrl.py (.../mixing_cntrl.py) (revision e412f48fe7363639f8e729d2274501ec02d51aa9) @@ -63,6 +63,12 @@ self.current_acid_mix_volume = 0.0 self.last_acid_mix_volume = 0.0 + self.bicarb_conductivity_pre_mix = 0.0 + self.bicarb_conductivity_post_mix = 0.0 + self.acid_conductivity_post_mix = 0.0 + self.total_conductivity = 0.0 + + #TODO remove after final testing self.bcarb_ctlrl_signal.control_signal_reference = 0.0 self.bcarb_ctlrl_signal.control_signal_measured = 0.0 @@ -98,6 +104,8 @@ @publish(["msg_id_dd_mixing_control_data", "bicarb_mixing_state", "bicarb_control_interval", "acid_mixing_state", "acid_control_interval", + "bicarb_conductivity_pre_mix", "bicarb_conductivity_post_mix", "acid_conductivity_post_mix", + "total_conductivity", "bicarb_reference", "bicarb_measured", "bicarb_error ", "bicarb_error_sum", "bicarb_error_sum_after_windup", "bicarb_proportional_output", "bicarb_integral_output", "bicarb_feed_forward_output", "bicarb_control", @@ -125,6 +133,11 @@ msg_list.append(('self.current_acid_mix_volume', DataTypes.F32)) msg_list.append(('self.last_acid_mix_volume', DataTypes.F32)) + msg_list.append(('self.bicarb_conductivity_pre_mix', DataTypes.F32)) + msg_list.append(('self.bicarb_conductivity_post_mix', DataTypes.F32)) + msg_list.append(('self.acid_conductivity_post_mix', DataTypes.F32)) + msg_list.append(('self.total_conductivity', DataTypes.F32)) + msg_list.append(('self.bcarb_ctlrl_signal.control_signal_reference', DataTypes.F32)) msg_list.append(('self.bcarb_ctlrl_signal.control_signal_measured', DataTypes.F32)) msg_list.append(('self.bcarb_ctlrl_signal.control_signal_error', DataTypes.F32))