Index: leahi_dialin/fp/modules/temperatures.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -24,22 +24,22 @@ 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, 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.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray class FPTemperatureSensors(AbstractSubSystem): - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): super().__init__() self.can_interface = can_interface 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, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.fp_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_FP_TEMPERATURE_DATA.value, function = self._handler_temperature_sensors_sync) @@ -102,7 +102,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_TEMPERATURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'FP Temperature Sensors', logger = self.logger, @@ -145,7 +145,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = msg_id, entity_name = f'FP {sensor_name} Temperature Sensor temperature', override_text = str(sensor_value), @@ -190,7 +190,7 @@ return cmd_generic_override( payload=payload, reset=reset, - channel_id=DenaliChannels.dialin_to_fp_ch_id, + channel_id=CanChannels.dialin_to_fp_ch_id, msg_id=msg_id, entity_name=f'FP {sensor_name} Temperature Sensor filtered temperature', override_text=str(sensor_value),