Index: leahi_dialin/fp/modules/levels.py =================================================================== diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -re60ad12bcc58d5905d7268bbeaae139d8233e023 --- leahi_dialin/fp/modules/levels.py (.../levels.py) (revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863) +++ leahi_dialin/fp/modules/levels.py (.../levels.py) (revision e60ad12bcc58d5905d7268bbeaae139d8233e023) @@ -20,7 +20,7 @@ from .constants import NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.fp_defs import FPFloaterLevels, FPFloaterLevelSensorNames +from leahi_dialin.common.fp_defs import fp_enum_repository from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum from leahi_dialin.utils.checks import check_broadcast_interval_override_ms @@ -50,7 +50,7 @@ self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_level_data, self._handler_levels_sync) self.fp_levels = { - FPFloaterLevelSensorNames.P25_LEVEL.name: 0 + fp_enum_repository.FPFloaterLevelSensorNames.P25_LEVEL.name: 0 } self.fp_levels_timestamp = 0 @@ -64,7 +64,7 @@ @param message: published levels data message @returns none """ - self.fp_levels[FPFloaterLevelSensorNames.P25_LEVEL.name] = struct.unpack('i', bytearray( + self.fp_levels[fp_enum_repository.FPFloaterLevelSensorNames.P25_LEVEL.name] = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] self.fp_levels_timestamp = timestamp