Index: dialin/common/msg_ids.py =================================================================== diff -u -ra7512831552e0e4431ceface9d5d08483db10056 -rdff977d40c350edae117aa44775e38783efe0a05 --- dialin/common/msg_ids.py (.../msg_ids.py) (revision a7512831552e0e4431ceface9d5d08483db10056) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision dff977d40c350edae117aa44775e38783efe0a05) @@ -184,6 +184,7 @@ MSG_ID_DG_SWITCHES_DATA = 0XA1 MSG_ID_HD_SWITCHES_DATA = 0XA2 MSG_ID_HD_FANS_DATA = 0XA3 + MSG_ID_DG_DIALYSATE_FLOW_METER_DATA = 0xA6 MSG_ID_CAN_ERROR_COUNT = 0X999 MSG_ID_TESTER_LOGIN_REQUEST = 0X8000 MSG_ID_DIAL_OUT_FLOW_SET_PT_OVERRIDE = 0X8001 @@ -316,7 +317,7 @@ MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE = 0XA00A MSG_ID_DRAIN_PUMP_SET_RPM_OVERRIDE = 0XA00B MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE = 0XA00C - MSG_ID_LOAD_CELLL_SEND_INTERVAL_OVERRIDE = 0XA00D + MSG_ID_LOAD_CELL_SEND_INTERVAL_OVERRIDE = 0XA00D MSG_ID_VALVE_STATE_OVERRIDE = 0XA00E MSG_ID_VALVES_STATES_PUBLISH_INTERVAL_OVERRIDE = 0XA00F MSG_ID_TEMPERATURE_SENSORS_VALUE_OVERRIDE = 0XA010 @@ -336,7 +337,7 @@ MSG_ID_DG_SWITCHES_PUBLISH_INTERVAL_OVERRIDE = 0XA01E MSG_ID_DG_OP_MODE_PUBLISH_INTERVAL_OVERRIDE = 0XA01F MSG_ID_DG_BLOCK_MESSAGE_TRANSMISSION = 0XA020 - MSG_ID___AVAILABLE_16 = 0XA021 + MSG_ID_DIALYSATE_MEASURED_FLOW_OVERRIDE = 0xA021 MSG_ID_DG_SOFTWARE_RESET_REQUEST = 0XA022 MSG_ID_DG_CONCENTRATE_PUMP_MEASURED_SPEED_OVERRIDE = 0XA023 MSG_ID_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE = 0XA024 @@ -369,6 +370,7 @@ MSG_ID_DG_FLUID_LEAK_STATE_DETECTOR_OVERRIDE = 0XA040 MSG_ID_DG_FLUSH_PUBLISH_INTERVAL_OVERRIDE = 0XA041 MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE = 0XA042 + MSG_ID_DIALYSATE_FLOW_SEND_INTERVAL_OVERRIDE = 0xA044 MSG_ID_HD_DEBUG_EVENT = 0XFFF1 MSG_ID_DG_DEBUG_EVENT = 0XFFF2 MSG_ID_ACK_MESSAGE_THAT_REQUIRES_ACK = 0XFFFF Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -r965b384855cf17d6b975f9989f13a26248e2d919 -rdff977d40c350edae117aa44775e38783efe0a05 --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 965b384855cf17d6b975f9989f13a26248e2d919) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision dff977d40c350edae117aa44775e38783efe0a05) @@ -177,6 +177,7 @@ self.system_record = DGSystemNVRecord(self.can_interface, self.logger) self.temperature_sensors = TemperatureSensors(self.can_interface, self.logger) self.thermistors = Thermistors(self.can_interface, self.logger) + self.dialysate_flow_sensor = DialysateFlowSensor(self.can_interface, self.logger) self.uv_reactors = UVReactors(self.can_interface, self.logger) self.valves = DGValves(self.can_interface, self.logger) self.voltages = DGVoltages(self.can_interface, self.logger)