Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -r7e75f0609ea6e44ba9f1d5da41106059ad2abb10 -r58b407f058f91bdecf050dcf2bd336bb0abc395b --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 7e75f0609ea6e44ba9f1d5da41106059ad2abb10) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 58b407f058f91bdecf050dcf2bd336bb0abc395b) @@ -22,6 +22,7 @@ from .valves import DGValves from .ro_pump import DGROPump from .heaters import Heaters +from .temperature_sensors import TemperatureSensors from ..protocols.CAN import (DenaliCanMessenger, DenaliMessage, DenaliChannels) @@ -97,7 +98,7 @@ msg_id = self.MSG_ID_DG_OPERATION_MODE_BROADCAST self.can_interface.register_receiving_publication_function(channel_id, msg_id, self.handler_dg_op_mode_sync) - self.can_interface.register_receiving_publication_function(DenaliChannels.dg_to_dialin_ch_id, + self.can_interface.register_receiving_publication_function(DenaliChannels.dg_sync_broadcast_ch_id, self.MSG_ID_DG_DG_VERSION_RESPONSE, self.handler_dg_version) @@ -108,14 +109,15 @@ self.dg_operation_sub_mode = 0 # Create command groups - self.hd_proxy = DGHDProxy(self.can_interface) - self.load_cells = DGLoadCells(self.can_interface) - self.pressures = DGPressures(self.can_interface) - self.reservoirs = DGReservoirs(self.can_interface) - self.valves = DGValves(self.can_interface) - self.ro_pump = DGROPump(self.can_interface) - self.drain_pump = DGDrainPump(self.can_interface) + #self.hd_proxy = DGHDProxy(self.can_interface) + #self.load_cells = DGLoadCells(self.can_interface) + #self.pressures = DGPressures(self.can_interface) + #self.reservoirs = DGReservoirs(self.can_interface) + #self.valves = DGValves(self.can_interface) + #self.ro_pump = DGROPump(self.can_interface) + #self.drain_pump = DGDrainPump(self.can_interface) self.heaters = Heaters(self.can_interface) + self.temperature_sensors = TemperatureSensors(self.can_interface) def handler_dg_version(self, message): """ @@ -141,6 +143,7 @@ if len(major) > 0 and len(minor) > 0 and len(micro) > 0 and len(build) > 0: self.dg_version = f"v{major[0]}.{minor[0]}.{micro[0]}-{build[0]}" print(self.dg_version) + return self.dg_version def handler_dg_op_mode_sync(self, message):