Index: leahi_dialin/fp/modules/permeate_tank.py =================================================================== diff -u -r27cd8e0e7b47617083e8c12f73306f0ba648e687 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/fp/modules/permeate_tank.py (.../permeate_tank.py) (revision 27cd8e0e7b47617083e8c12f73306f0ba648e687) +++ leahi_dialin/fp/modules/permeate_tank.py (.../permeate_tank.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -22,7 +22,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_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.base import publish @@ -34,7 +34,7 @@ Filtration Purification (FP) Dialin API sub-class for permeate tank related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ @param can_interface: Leahi Can Messenger object """ @@ -44,7 +44,7 @@ self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.fp_sync_broadcast_ch_id, # DenaliChannels.dd_sync_broadcast_ch_id ?? + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.fp_sync_broadcast_ch_id, # Channels.dd_sync_broadcast_ch_id ?? message_id = MsgIds.MSG_ID_FP_PERMEATE_TANK_DATA.value, function = self._handler_permeate_tank_sync) @@ -82,7 +82,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_PERMEATE_TANK_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'FP Permeate Tank', logger = self.logger,