Index: leahi_dialin/td/modules/air_pump.py =================================================================== diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -rd27c40205e18118f4689f62463a266da1f91dba6 --- leahi_dialin/td/modules/air_pump.py (.../air_pump.py) (revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863) +++ leahi_dialin/td/modules/air_pump.py (.../air_pump.py) (revision d27c40205e18118f4689f62463a266da1f91dba6) @@ -19,7 +19,7 @@ from .constants import RESET, NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.td_defs import TDAirPumpNames, TDAirPumpAttributes +from leahi_dialin.common.td_defs import td_enum_repository from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish from leahi_dialin.utils.checks import check_broadcast_interval_override_ms @@ -49,9 +49,9 @@ self._handler_air_pump_sync) self.td_air_pump = { - TDAirPumpNames.H12_AIR_PUMP.name: { - TDAirPumpAttributes.STATE.name: 0, - TDAirPumpAttributes.POWER.name: 0 + td_enum_repository.TDAirPumpNames.H12_AIR_PUMP.name: { + td_enum_repository.TDAirPumpAttributes.STATE.name: 0, + td_enum_repository.TDAirPumpAttributes.POWER.name: 0 } } @@ -70,8 +70,8 @@ app = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) - self.td_air_pump[TDAirPumpNames.H12_AIR_PUMP.name][TDAirPumpAttributes.STATE.name] = aps[0] - self.td_air_pump[TDAirPumpNames.H12_AIR_PUMP.name][TDAirPumpAttributes.POWER.name] = app[0] + self.td_air_pump[td_enum_repository.TDAirPumpNames.H12_AIR_PUMP.name][td_enum_repository.TDAirPumpAttributes.STATE.name] = aps[0] + self.td_air_pump[td_enum_repository.TDAirPumpNames.H12_AIR_PUMP.name][td_enum_repository.TDAirPumpAttributes.POWER.name] = app[0] self.td_air_pump_timestamp = timestamp def cmd_air_pump_set_state(self, state: int, power: int) -> int: