Index: dialin/common/msg_ids.py =================================================================== diff -u -r5eb006b08eb1d7b641b22fff20072ab7b685cfec -r51fb1c251f0ba1fb83d935a43208bb10d9c791fe --- dialin/common/msg_ids.py (.../msg_ids.py) (revision 5eb006b08eb1d7b641b22fff20072ab7b685cfec) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision 51fb1c251f0ba1fb83d935a43208bb10d9c791fe) @@ -202,6 +202,13 @@ MSG_ID_DG_FLOW_SENSORS_DATA = 0xB3 MSG_ID_DG_RESPONSE_SERVICE_MODE_REQUEST = 0xB4 MSG_ID_HD_REQUEST_DG_ALARMS = 0xB5 + MSG_ID_HD_REQUEST_DG_SERVICE_MODE = 0xB6 + MSG_ID_DG_RTC_EPOCH = 0xB7 + MSG_ID_HD_REQUEST_DG_USAGE_INFO = 0xB8 + MSG_ID_HD_REQUEST_UI_CONFIRMATION = 0xBA + MSG_ID_UI_CONFIRMATION_RESULT = 0xBB + MSG_ID_REQUEST_CPLD_STATUS = 0xBC + MSG_ID_DG_CPLD_STATUS = 0xBD MSG_ID_CAN_ERROR_COUNT = 0x999 @@ -424,6 +431,7 @@ MSG_ID_DG_SEND_USAGE_INFO_RECORD = 0xA055 MSG_ID_DG_SET_OP_MODE_REQUEST = 0xA056 MSG_ID_DG_RESERVOIR_TARE_REQUEST = 0xA057 + MSG_ID_CPLD_PUBLISH_INTERVAL_OVERRIDE = 0xA058 MSG_ID_HD_DEBUG_EVENT = 0xFFF1 MSG_ID_DG_DEBUG_EVENT = 0xFFF2 Index: dialin/dg/cpld.py =================================================================== diff -u -r5baefe4e0455ab80400d8e8aa4400d83bce2dc75 -r51fb1c251f0ba1fb83d935a43208bb10d9c791fe --- dialin/dg/cpld.py (.../cpld.py) (revision 5baefe4e0455ab80400d8e8aa4400d83bce2dc75) +++ dialin/dg/cpld.py (.../cpld.py) (revision 51fb1c251f0ba1fb83d935a43208bb10d9c791fe) @@ -9,8 +9,8 @@ # # @author (last) Dara Navaei # @date (last) 20-Jun-2022 -# @author (original) Quang Nguyen -# @date (original) 20-Jul-2020 +# @author (original) Darren Cox +# @date (original) 29-Sept-2022 # ############################################################################ import struct Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -r5eb006b08eb1d7b641b22fff20072ab7b685cfec -r51fb1c251f0ba1fb83d935a43208bb10d9c791fe --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 5eb006b08eb1d7b641b22fff20072ab7b685cfec) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 51fb1c251f0ba1fb83d935a43208bb10d9c791fe) @@ -23,6 +23,7 @@ from .concentrate_pumps import ConcentratePumps from .conductivity_sensors import ConductivitySensors from .constants import RESET, NO_RESET +from .cpld import Cpld from .drain_pump import DGDrainPump from .fans import Fans from .dialysate_fill import DialysateFill @@ -164,6 +165,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.dialysate_flow_sensor = DialysateFlowSensor(self.can_interface, self.logger) self.drain_pump = DGDrainPump(self.can_interface, self.logger)