Index: leahi_dialin/td/modules/switches.py =================================================================== diff -u -r2138d06d100fdcf23f2e9069f35ee2fdee62008f -rd0d72ba74208cb43073ec38c7bbfebb2d32dcc66 --- leahi_dialin/td/modules/switches.py (.../switches.py) (revision 2138d06d100fdcf23f2e9069f35ee2fdee62008f) +++ leahi_dialin/td/modules/switches.py (.../switches.py) (revision d0d72ba74208cb43073ec38c7bbfebb2d32dcc66) @@ -20,7 +20,7 @@ from leahi_dialin.utils.conversions import integer_to_bytearray from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.td.constants import RESET, NO_RESET +from .constants import RESET, NO_RESET 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 @@ -35,7 +35,7 @@ @unique class TDSwitchesNames(DialinEnum): - FRONT_DOOR = 0 + H9_FRONT_DOOR = 0 NUM_OF_DOORS_AND_SWITCHES = 1 @@ -60,7 +60,7 @@ self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_switches_sync) - self.td_switches_status = {TDSwitchesNames.FRONT_DOOR.name: TDSwitchStatus.CLOSED.value} + self.td_switches_status = {TDSwitchesNames.H9_FRONT_DOOR.name: TDSwitchStatus.CLOSED.value} self.td_switches_timestamp = 0.0 @publish(["td_switches_timestamp", "td_switches_status"]) @@ -74,7 +74,7 @@ front_door = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.td_switches_status[TDSwitchesNames.FRONT_DOOR.name] = TDSwitchStatus(front_door).value + self.td_switches_status[TDSwitchesNames.H9_FRONT_DOOR.name] = TDSwitchStatus(front_door).value def cmd_switch_status_override(self, switch: int, status: int, reset: int = NO_RESET) -> int: """