Index: leahi_dialin/dd/proxies/ro_proxy.py =================================================================== diff -u -r6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/dd/proxies/ro_proxy.py (.../ro_proxy.py) (revision 6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1) +++ leahi_dialin/dd/proxies/ro_proxy.py (.../ro_proxy.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -20,7 +20,7 @@ # Project imports from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -30,11 +30,11 @@ Dialysate Delivery (DD) Dialin API sub-class for RO proxy ( injection ) related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ ROProxy constructor - @param can_interface: the Denali CAN interface object + @param can_interface: the CAN interface object """ super().__init__() self.can_interface = can_interface @@ -59,7 +59,7 @@ cmd_generic_override(payload = payload, reset = None, - channel_id = DenaliChannels.dd_to_ro_ch_id, + channel_id = CanChannels.dd_to_ro_ch_id, msg_id = MsgIds.MSG_ID_DD_FP_START_STOP_CMD_REQUEST, entity_name = 'DD Start Stop Request to RO', override_text = 'N/A',