Index: leahi_dialin/dd/modules/mixing_cntrl.py =================================================================== diff -u -r6e34c84bcfc3ee3a70c78351fc1c67b98e46ff4d -r5f5ced3d57a38abd63b01e82b8945819c48a229b --- leahi_dialin/dd/modules/mixing_cntrl.py (.../mixing_cntrl.py) (revision 6e34c84bcfc3ee3a70c78351fc1c67b98e46ff4d) +++ leahi_dialin/dd/modules/mixing_cntrl.py (.../mixing_cntrl.py) (revision 5f5ced3d57a38abd63b01e82b8945819c48a229b) @@ -55,9 +55,16 @@ self.dd_dry_bicart_timestamp = 0 #: The timestamp of the last message - self.dd_dry_bicart_bicarb_mix_vol = 0.0 - self.dd_dry_bicart_acid_mix_vol = 0.0 + self.bicarb_mixing_state = 0 + self.bicarb_control_interval = 0 + self.acid_mixing_state = 0 + self.acid_control_interval = 0 + self.current_bicarb_mix_volume = 0.0 + self.last_bicarb_mix_volume = 0.0 + self.current_acid_mix_volume = 0.0 + self.last_acid_mix_volume = 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 @@ -103,10 +110,17 @@ @return: None """ msg_list = [] - - msg_list.append(('self.dd_dry_bicart_bicarb_mix_vol', DataTypes.F32)) - msg_list.append(('self.dd_dry_bicart_acid_mix_vol', DataTypes.F32)) + msg_list.append(('self.bicarb_mixing_state', DataTypes.U32)) + msg_list.append(('self.bicarb_control_interval', DataTypes.U32)) + msg_list.append(('self.acid_mixing_state', DataTypes.U32)) + msg_list.append(('self.acid_control_interval', DataTypes.U32)) + + msg_list.append(('self.current_bicarb_mix_volume', DataTypes.F32)) + msg_list.append(('self.last_bicarb_mix_volume', DataTypes.F32)) + msg_list.append(('self.current_acid_mix_volume', DataTypes.F32)) + msg_list.append(('self.last_acid_mix_volume', 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))