Index: dialin/common/msg_defs.py =================================================================== diff -u -r5f109951b1eec291a8da38aba01470d3aa5a95b5 -rca0e51b8614c9b712aaad1f8342f6c7d5817bf80 --- dialin/common/msg_defs.py (.../msg_defs.py) (revision 5f109951b1eec291a8da38aba01470d3aa5a95b5) +++ dialin/common/msg_defs.py (.../msg_defs.py) (revision ca0e51b8614c9b712aaad1f8342f6c7d5817bf80) @@ -99,7 +99,8 @@ MsgIds.MSG_ID_HD_FANS_DATA.value, MsgIds.MSG_ID_DG_DIALYSATE_FLOW_METER_DATA.value, MsgIds.MSG_ID_DG_ALARM_INFO.value, - MsgIds.MSG_ID_HD_RESERVOIRS_DATA.value + MsgIds.MSG_ID_HD_RESERVOIRS_DATA.value, + MsgIds.MSG_ID_DG_CPLD_STATUS.value ] Index: dialin/common/msg_ids.py =================================================================== diff -u -r51fb1c251f0ba1fb83d935a43208bb10d9c791fe -rca0e51b8614c9b712aaad1f8342f6c7d5817bf80 --- dialin/common/msg_ids.py (.../msg_ids.py) (revision 51fb1c251f0ba1fb83d935a43208bb10d9c791fe) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision ca0e51b8614c9b712aaad1f8342f6c7d5817bf80) @@ -7,8 +7,8 @@ # # @file msg_ids.py # -# @author (last) Sean Nash -# @date (last) 29-Jul-2022 +# @author (last) Dara Navaei +# @date (last) 04-Sep-2022 # @author (original) Peter Lucia # @date (original) 06-Apr-2021 # @@ -344,6 +344,9 @@ MSG_ID_HD_SET_BLOOD_LEAK_EMB_MODE_COMMAND = 0x8082 MSG_ID_HD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE = 0x8083 MSG_ID_HD_SEND_ALARMS_COMMAND = 0x8084 + MSG_ID_HD_BLOOD_PUMP_SET_PWM = 0x8085 + MSG_ID_HD_DIAL_IN_SET_PWM = 0x8086 + MSG_ID_HD_DIAL_OUT_SET_PWM = 0x8087 MSG_ID_DG_TESTER_LOGIN_REQUEST = 0xA000 MSG_ID_DG_ALARM_STATE_OVERRIDE = 0xA001 @@ -377,7 +380,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_DIALYSATE_MEASURED_FLOW_OVERRIDE = 0xA021 + MSG_ID_MEASURED_FLOW_SENSORS_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 @@ -391,7 +394,7 @@ MSG_ID_DG_THERMISTORS_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA02D MSG_ID_DG_THERMISTORS_VALUE_OVERRIDE = 0xA02E MSG_ID_DG_RO_PUMP_DUTY_CYCLE_OVERRIDE = 0xA02F - MSG_ID_DG_RO_FLOW_RATE_OVERRIDE = 0xA030 + MSG_ID____AVAILABLE_5 = 0xA030 MSG_ID_DG_SET_RO_PUMP_TARGET_FLOW = 0xA031 MSG_ID_DG_RO_PUMP_TARGET_PRESSURE_OVERRIDE = 0xA032 MSG_ID_DG_SET_CALIBRATION_RECORD = 0xA033 @@ -411,7 +414,7 @@ MSG_ID_DG_FLUSH_PUBLISH_INTERVAL_OVERRIDE = 0xA041 MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE = 0xA042 MSG_ID_DG_FANS_RPM_OVERRIDE = 0xA043 - MSG_ID_DIALYSATE_FLOW_SEND_INTERVAL_OVERRIDE = 0xA044 + MSG_ID_FLOW_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA044 MSG_ID_DG_STOP_RTC_CLOCK = 0xA045 MSG_ID_DG_DRAIN_PUMP_MEASURED_RPM_OVERRIDE = 0xA046 MSG_ID_DG_SUPER_CLEAR_ALARMS_CMD = 0xA047 Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -rd759d3a2a1aed849da9ad9153f268eb9f8b1f6f6 -rca0e51b8614c9b712aaad1f8342f6c7d5817bf80 --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision d759d3a2a1aed849da9ad9153f268eb9f8b1f6f6) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision ca0e51b8614c9b712aaad1f8342f6c7d5817bf80) @@ -20,7 +20,8 @@ from .chemical_disinfect import ChemicalDisinfect from .concentrate_pumps import ConcentratePumps from .conductivity_sensors import ConductivitySensors -from .constants import RESET +from .constants import RESET, NO_RESET +from .cpld import Cpld from .drain_pump import DGDrainPump from .fans import Fans from .dialysate_fill import DialysateFill @@ -163,6 +164,7 @@ self.chemical_disinfect = ChemicalDisinfect(self.can_interface, self.logger) self.concentrate_pumps = ConcentratePumps(self.can_interface, self.logger) self.conductivity_sensors = ConductivitySensors(self.can_interface, self.logger) + self.cpld = Cpld(self.can_interface, self.logger) self.dialysate_fill = DialysateFill(self.can_interface, self.logger) self.drain_pump = DGDrainPump(self.can_interface, self.logger) self.fans = Fans(self.can_interface, self.logger)