Index: leahi_dialin/td/treatment_delivery.py =================================================================== diff -u -r0c1da102269169d5b63f91e146488b20eaa883a7 -rb3774ad1df35c613de1c09bef40a55eb0ce4af36 --- leahi_dialin/td/treatment_delivery.py (.../treatment_delivery.py) (revision 0c1da102269169d5b63f91e146488b20eaa883a7) +++ leahi_dialin/td/treatment_delivery.py (.../treatment_delivery.py) (revision b3774ad1df35c613de1c09bef40a55eb0ce4af36) @@ -21,6 +21,8 @@ from .modules.blood_flow import TDBloodFlow from .modules.bubble_detector import TDBubbleDectector from .modules.buttons import TDButtons +from .modules.constants import NO_RESET, RESET +from .modules.ejector import TDEjector from .modules.pressure_sensors import TDPressureSensors from .modules.switches import TDSwitches from .modules.treatment import TDTreatment @@ -121,6 +123,7 @@ self.blood_flow = TDBloodFlow(self.can_interface, self.logger) self.bubbles = TDBubbleDectector(self.can_interface, self.logger) self.buttons = TDButtons(self.can_interface, self.logger) + self.ejector = TDEjector(self.can_interface, self.logger) self.pressure_sensors = TDPressureSensors(self.can_interface, self.logger) self.switches = TDSwitches(self.can_interface, self.logger) self.treatment = TDTreatment(self.can_interface, self.logger) @@ -223,7 +226,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id, - message_id=MsgIds.MSG_ID_TESTER_LOGIN_REQUEST.value, + message_id=MsgIds.MSG_ID_TD_TESTER_LOGIN_REQUEST.value, payload=list(map(int, map(ord, self.TD_LOGIN_PASSWORD)))) self.logger.debug("Logging in...")