Index: leahi_dialin/dd/dialysate_delivery.py =================================================================== diff -u -r2dab2b0329a56006e07cd36a3883ed099d7a367a -reb02c56e88faeeda46ed62b1c0ec841dca0b9aba --- leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision 2dab2b0329a56006e07cd36a3883ed099d7a367a) +++ leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision eb02c56e88faeeda46ed62b1c0ec841dca0b9aba) @@ -23,9 +23,7 @@ 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 @@ -122,9 +120,7 @@ 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) @@ -191,7 +187,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_TESTER_LOGIN_REQUEST.value, + message_id=MsgIds.MSG_ID_TESTER_LOGIN_REQUEST.value, payload=list(map(int, map(ord, self.DD_LOGIN_PASSWORD)))) self.logger.debug("Logging in...")