Index: dialin/common/msg_ids.py =================================================================== diff -u -r8c1ae1a592e02562ad9bded9ea2bd199fa80f4bf -r0ddab6f6a3317534265eed3f88ecb8a6b4f3e849 --- dialin/common/msg_ids.py (.../msg_ids.py) (revision 8c1ae1a592e02562ad9bded9ea2bd199fa80f4bf) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision 0ddab6f6a3317534265eed3f88ecb8a6b4f3e849) @@ -193,6 +193,9 @@ MSG_ID_DG_CONCENTRATE_MIXING_RATIOS_DATA = 0xAA MSG_ID_DG_SCHEDULED_RUNS_DATA = 0xAB MSG_ID_DG_SCHEDULED_RUNS_INFO = 0xAC + MSG_ID_UI_INSTALLATION_CONFIRM_RESPONSE = 0xAD + MSG_ID_DG_FILL_MODE_DATA = 0xAE + MSG_ID_DG_BAD_FILL_SUB_STATE = 0xAF MSG_ID_CAN_ERROR_COUNT = 0x999 @@ -397,6 +400,11 @@ MSG_ID_DG_SET_SW_CONFIG_RECORD = 0xA04B MSG_ID_DG_SEND_SW_CONFIG_RECORD = 0xA04C MSG_ID_DG_FANS_DUTY_CYCLE_OVERRIDE = 0xA04D + MSG_ID_DG_USED_ACID_VOLUME_ML_OVERRIDE = 0xA04E + MSG_ID_DG_SET_FANS_RPM_ALARM_START_TIME_OFFSET = 0xA04F + MSG_ID_DG_USED_BICARB_VOLUME_ML_OVERRIDE = 0xA050 + MSG_ID_FILL_MODE_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA051 + MSG_ID_BAD_FILL_SUBSTATES_PUBLISH_INTERVAL_OVERRIDE = 0xA052 MSG_ID_HD_DEBUG_EVENT = 0xFFF1 Index: dialin/dg/ro_pump.py =================================================================== diff -u -r68e6f7c82ebb25658b4fecece474c2640a6dff87 -r0ddab6f6a3317534265eed3f88ecb8a6b4f3e849 --- dialin/dg/ro_pump.py (.../ro_pump.py) (revision 68e6f7c82ebb25658b4fecece474c2640a6dff87) +++ dialin/dg/ro_pump.py (.../ro_pump.py) (revision 0ddab6f6a3317534265eed3f88ecb8a6b4f3e849) @@ -62,7 +62,7 @@ self.ro_pump_state = 0 self.target_flow_lpm = 0.0 self.feedback_duty_cycle_pct = 0.0 - self.measured_raw_flow_rate_mlp = 0.0 + self.measured_raw_flow_rate_with_conc_pumps_mlp = 0.0 def get_target_pressure(self): """ @@ -102,10 +102,10 @@ @return: The RO pump measured raw flow rate in mL/min """ - return self.measured_raw_flow_rate_mlp + return self.measured_raw_flow_rate_with_conc_pumps_mlp @publish(["target_pressure_psi", "measured_flow_rate_lpm", "pwm_duty_cycle_pct", "ro_pump_state", - "feedback_duty_cycle_pct", "measured_raw_flow_rate_mlp"]) + "feedback_duty_cycle_pct", "measured_raw_flow_rate_with_conc_pumps_mlp"]) def _handler_ro_pump_sync(self, message): """ Handles published ro pump data messages. RO pump data are captured @@ -127,7 +127,7 @@ message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] self.feedback_duty_cycle_pct = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] - self.measured_raw_flow_rate_mlp = struct.unpack('f', bytearray( + self.measured_raw_flow_rate_with_conc_pumps_mlp = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] self.ro_pump_state = ROPumpStates(ro_state).name