Index: leahi_dialin/dd/dialysate_delivery.py =================================================================== diff -u -r2dc81a7a48da08c15dd26020a30d4401b00ded9b -r2dab2b0329a56006e07cd36a3883ed099d7a367a --- leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision 2dc81a7a48da08c15dd26020a30d4401b00ded9b) +++ leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision 2dab2b0329a56006e07cd36a3883ed099d7a367a) @@ -23,7 +23,9 @@ from .modules.heaters import DDHeaters from .modules.levels import DDLevels from .modules.piston_pump import DDPistonPumps +from .modules.post_gen_dialysate import DDPostGenDialysate from .modules.pressure_sensors import DDPressureSensors +from .modules.pre_gen_dialysate import DDPreGenDialysate from .modules.temperature_sensors import DDTemperatureSensors from .modules.valves import DDValves @@ -120,7 +122,9 @@ self.heaters = DDHeaters(self.can_interface, self.logger) self.levels = DDLevels(self.can_interface, self.logger) self.piston_pumps = DDPistonPumps(self.can_interface, self.logger) + self.post_gen_dialysate = DDPostGenDialysate(self.can_interface, self.logger) self.pressure_sensors = DDPressureSensors(self.can_interface, self.logger) + self.pre_gen_dialysate = DDPreGenDialysate(self.can_interface, self.logger) self.temperature_sensors = DDTemperatureSensors(self.can_interface, self.logger) self.valves = DDValves(self.can_interface, self.logger) @@ -187,7 +191,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_TESTER_LOGIN_REQUEST.value, + message_id=MsgIds.MSG_ID_DD_TESTER_LOGIN_REQUEST.value, payload=list(map(int, map(ord, self.DD_LOGIN_PASSWORD)))) self.logger.debug("Logging in...")