Index: leahi_dialin/fp/filtration_purification.py =================================================================== diff -u -reca9e15bc984af2b7f59eb38f3836ca354ee1251 -rb7d86216a91c9fbf74af7c6233ed0b6eaf74cd75 --- leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision eca9e15bc984af2b7f59eb38f3836ca354ee1251) +++ leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision b7d86216a91c9fbf74af7c6233ed0b6eaf74cd75) @@ -31,15 +31,15 @@ from .proxies.dd_proxy import DDProxy -from ..common.constants import NO_RESET, MSG_HEADER_SIZE -from ..common import fp_enum_repository -from ..common.generic_defs import DataTypes -from ..common.msg_ids import MsgIds -from ..common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from ..protocols.CAN import CanMessage, CanMessenger, CanChannels +from leahi_dialin.common.constants import NO_RESET, MSG_HEADER_SIZE +from leahi_dialin.common import fp_enum_repository +from leahi_dialin.common.generic_defs import DataTypes +from leahi_dialin.common.msg_ids import MsgIds +from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override +from leahi_dialin.protocols.CAN import CanMessage, CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem, LocalVars from leahi_dialin.utils.base import publish, LogManager -from ..utils.conversions import integer_to_bytearray, bytearray_to_byte +from leahi_dialin.utils.conversions import integer_to_bytearray, bytearray_to_byte class FP(AbstractSubSystem): @@ -453,7 +453,7 @@ payload = payload, reset = NO_RESET, channel_id = CanChannels.dialin_to_fp_ch_id, - msg_id = MsgIds.MSG_ID_FP_SET_OP_MODE_REQUEST, + msg_id = MsgIds.MSG_ID_FP_SET_OPERATION_MODE_REQUEST, entity_name = 'FP Operation Mode', override_text = fp_enum_repository.FPOpModes(new_mode).name, logger = self.logger, @@ -496,7 +496,7 @@ payload = payload, reset = NO_RESET, channel_id = CanChannels.dialin_to_fp_ch_id, - msg_id = MsgIds.MSG_ID_FP_SET_OP_SUB_MODE_REQUEST, + msg_id = MsgIds.MSG_ID_FP_SET_OPERATION_SUB_MODE_REQUEST, entity_name = 'FP Operation Sub Mode', override_text = new_sub_mode_enum.name, logger = self.logger,