Index: dialin/hd/blood_flow.py =================================================================== diff -u -rebf0a72a1a1a52f3cfe20975de4857201275888c -r076965b54ec7f9711537ad5553de65b4da11338e --- dialin/hd/blood_flow.py (.../blood_flow.py) (revision ebf0a72a1a1a52f3cfe20975de4857201275888c) +++ dialin/hd/blood_flow.py (.../blood_flow.py) (revision 076965b54ec7f9711537ad5553de65b4da11338e) @@ -19,8 +19,7 @@ from .constants import PUMP_CONTROL_MODE_CLOSED_LOOP, PUMP_CONTROL_MODE_OPEN_LOOP from .constants import RESET, NO_RESET from ..common.msg_defs import MsgIds, MsgFieldPositions -from ..protocols.CAN import (DenaliMessage, - DenaliChannels) +from ..protocols.CAN import DenaliMessage, DenaliChannels from ..utils.base import AbstractSubSystem, publish from ..utils.checks import check_broadcast_interval_override_ms from ..utils.conversions import integer_to_bytearray, float_to_bytearray Index: dialin/hd/blood_leak.py =================================================================== diff -u -rebf0a72a1a1a52f3cfe20975de4857201275888c -r076965b54ec7f9711537ad5553de65b4da11338e --- dialin/hd/blood_leak.py (.../blood_leak.py) (revision ebf0a72a1a1a52f3cfe20975de4857201275888c) +++ dialin/hd/blood_leak.py (.../blood_leak.py) (revision 076965b54ec7f9711537ad5553de65b4da11338e) @@ -18,7 +18,7 @@ from .constants import RESET, NO_RESET from ..common.msg_defs import MsgIds, MsgFieldPositions -from ..protocols.CAN import (DenaliMessage, DenaliChannels) +from ..protocols.CAN import DenaliMessage, DenaliChannels from ..utils.base import AbstractSubSystem, publish from ..utils.conversions import integer_to_bytearray, float_to_bytearray Index: dialin/hd/buttons.py =================================================================== diff -u -rebf0a72a1a1a52f3cfe20975de4857201275888c -r076965b54ec7f9711537ad5553de65b4da11338e --- dialin/hd/buttons.py (.../buttons.py) (revision ebf0a72a1a1a52f3cfe20975de4857201275888c) +++ dialin/hd/buttons.py (.../buttons.py) (revision 076965b54ec7f9711537ad5553de65b4da11338e) @@ -18,9 +18,7 @@ from .constants import RESET, NO_RESET from ..common.msg_defs import MsgIds, MsgFieldPositions -from ..protocols.CAN import (DenaliMessage, - DenaliCanMessenger, - DenaliChannels) +from ..protocols.CAN import DenaliMessage, DenaliCanMessenger, DenaliChannels from ..utils.base import AbstractSubSystem, publish from ..utils.conversions import integer_to_bytearray Index: dialin/hd/calibration_record.py =================================================================== diff -u -rebf0a72a1a1a52f3cfe20975de4857201275888c -r076965b54ec7f9711537ad5553de65b4da11338e --- dialin/hd/calibration_record.py (.../calibration_record.py) (revision ebf0a72a1a1a52f3cfe20975de4857201275888c) +++ dialin/hd/calibration_record.py (.../calibration_record.py) (revision 076965b54ec7f9711537ad5553de65b4da11338e) @@ -4,7 +4,7 @@ from logging import Logger from ..common.msg_defs import MsgIds, MsgFieldPositions -from ..protocols.CAN import (DenaliMessage, DenaliChannels) +from ..protocols.CAN import DenaliMessage, DenaliChannels from ..utils.base import AbstractSubSystem, publish from ..utils.nv_ops_utils import NVOpsUtils Index: dialin/hd/rtc.py =================================================================== diff -u -rebf0a72a1a1a52f3cfe20975de4857201275888c -r076965b54ec7f9711537ad5553de65b4da11338e --- dialin/hd/rtc.py (.../rtc.py) (revision ebf0a72a1a1a52f3cfe20975de4857201275888c) +++ dialin/hd/rtc.py (.../rtc.py) (revision 076965b54ec7f9711537ad5553de65b4da11338e) @@ -17,8 +17,7 @@ from logging import Logger from ..common.msg_defs import MsgIds -from ..protocols.CAN import (DenaliMessage, - DenaliChannels) +from ..protocols.CAN import DenaliMessage, DenaliChannels from ..utils.base import AbstractSubSystem, publish from ..utils.conversions import integer_to_bytearray Index: dialin/hd/service_record.py =================================================================== diff -u -rfc66ba65a8746c71b2f7688acce29b3a779dbdf8 -r076965b54ec7f9711537ad5553de65b4da11338e --- dialin/hd/service_record.py (.../service_record.py) (revision fc66ba65a8746c71b2f7688acce29b3a779dbdf8) +++ dialin/hd/service_record.py (.../service_record.py) (revision 076965b54ec7f9711537ad5553de65b4da11338e) @@ -5,7 +5,7 @@ from logging import Logger from ..common.msg_defs import MsgIds, MsgFieldPositions -from ..protocols.CAN import (DenaliMessage, DenaliChannels) +from ..protocols.CAN import DenaliMessage, DenaliChannels from ..utils.base import AbstractSubSystem, publish, DialinEnum from ..utils.nv_ops_utils import NVOpsUtils Index: dialin/hd/syringe_pump.py =================================================================== diff -u -r78f3b6100f792682a26f87f6333a1d7243767fb6 -r076965b54ec7f9711537ad5553de65b4da11338e --- dialin/hd/syringe_pump.py (.../syringe_pump.py) (revision 78f3b6100f792682a26f87f6333a1d7243767fb6) +++ dialin/hd/syringe_pump.py (.../syringe_pump.py) (revision 076965b54ec7f9711537ad5553de65b4da11338e) @@ -19,8 +19,7 @@ from .constants import RESET, NO_RESET from ..common.hd_defs import HeparinStates, SyringePumpStates, SyringePumpOperations from ..common.msg_defs import MsgIds, MsgFieldPositions -from ..protocols.CAN import (DenaliMessage, - DenaliChannels) +from ..protocols.CAN import DenaliMessage, DenaliChannels from ..utils.base import AbstractSubSystem, publish from ..utils.checks import check_broadcast_interval_override_ms from ..utils.conversions import integer_to_bytearray, float_to_bytearray Index: dialin/hd/system_record.py =================================================================== diff -u -r717213478a1176cd315e5f4006ce8aeacbc4c0dc -r076965b54ec7f9711537ad5553de65b4da11338e --- dialin/hd/system_record.py (.../system_record.py) (revision 717213478a1176cd315e5f4006ce8aeacbc4c0dc) +++ dialin/hd/system_record.py (.../system_record.py) (revision 076965b54ec7f9711537ad5553de65b4da11338e) @@ -5,7 +5,7 @@ from logging import Logger from ..common.msg_defs import MsgIds, MsgFieldPositions -from ..protocols.CAN import (DenaliMessage, DenaliChannels) +from ..protocols.CAN import DenaliMessage, DenaliChannels from ..utils.base import AbstractSubSystem, publish, DialinEnum from ..utils.nv_ops_utils import NVOpsUtils Index: dialin/hd/treatment.py =================================================================== diff -u -rb781efb6e6c21894714199e9dbfb1c3ac2576e1c -r076965b54ec7f9711537ad5553de65b4da11338e --- dialin/hd/treatment.py (.../treatment.py) (revision b781efb6e6c21894714199e9dbfb1c3ac2576e1c) +++ dialin/hd/treatment.py (.../treatment.py) (revision 076965b54ec7f9711537ad5553de65b4da11338e) @@ -17,8 +17,7 @@ from logging import Logger from ..common.msg_defs import MsgIds, MsgFieldPositions -from ..protocols.CAN import (DenaliMessage, - DenaliChannels) +from ..protocols.CAN import DenaliMessage, DenaliChannels from ..utils.base import AbstractSubSystem, publish from ..utils.conversions import integer_to_bytearray, float_to_bytearray Index: dialin/hd/ui_proxy.py =================================================================== diff -u -r717213478a1176cd315e5f4006ce8aeacbc4c0dc -r076965b54ec7f9711537ad5553de65b4da11338e --- dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 717213478a1176cd315e5f4006ce8aeacbc4c0dc) +++ dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 076965b54ec7f9711537ad5553de65b4da11338e) @@ -19,8 +19,7 @@ from logging import Logger from ..common.msg_defs import MsgIds, RequestRejectReasons, MsgFieldPositions -from ..protocols.CAN import (DenaliMessage, - DenaliChannels) +from ..protocols.CAN import DenaliMessage, DenaliChannels from ..utils.base import AbstractSubSystem, publish from ..utils.conversions import integer_to_bytearray, float_to_bytearray Index: dialin/hd/watchdog.py =================================================================== diff -u -rebf0a72a1a1a52f3cfe20975de4857201275888c -r076965b54ec7f9711537ad5553de65b4da11338e --- dialin/hd/watchdog.py (.../watchdog.py) (revision ebf0a72a1a1a52f3cfe20975de4857201275888c) +++ dialin/hd/watchdog.py (.../watchdog.py) (revision 076965b54ec7f9711537ad5553de65b4da11338e) @@ -17,8 +17,7 @@ from .constants import RESET, NO_RESET from ..common import MsgIds -from ..protocols.CAN import (DenaliMessage, - DenaliChannels) +from ..protocols.CAN import DenaliMessage, DenaliChannels from ..utils.base import AbstractSubSystem from ..utils.conversions import integer_to_bytearray Index: dialin/ui/dg_simulator.py =================================================================== diff -u -r786d24b238743698b7dff28a64099985870fb41b -r076965b54ec7f9711537ad5553de65b4da11338e --- dialin/ui/dg_simulator.py (.../dg_simulator.py) (revision 786d24b238743698b7dff28a64099985870fb41b) +++ dialin/ui/dg_simulator.py (.../dg_simulator.py) (revision 076965b54ec7f9711537ad5553de65b4da11338e) @@ -14,9 +14,7 @@ # ############################################################################ from ..common import * -from ..protocols.CAN import (DenaliMessage, - DenaliCanMessenger, - DenaliChannels) +from ..protocols.CAN import DenaliMessage, DenaliCanMessenger, DenaliChannels from ..utils import * from ..utils.base import AbstractSubSystem, LogManager from . import messageBuilder Index: dialin/ui/hd_simulator.py =================================================================== diff -u -r786d24b238743698b7dff28a64099985870fb41b -r076965b54ec7f9711537ad5553de65b4da11338e --- dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 786d24b238743698b7dff28a64099985870fb41b) +++ dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 076965b54ec7f9711537ad5553de65b4da11338e) @@ -18,9 +18,7 @@ from . import messageBuilder from ..common import * -from ..protocols.CAN import (DenaliMessage, - DenaliCanMessenger, - DenaliChannels) +from ..protocols.CAN import DenaliMessage, DenaliCanMessenger, DenaliChannels from ..utils import * from ..utils.base import AbstractSubSystem, LogManager Index: dialin/ui/hd_simulator_alarms.py =================================================================== diff -u -r786d24b238743698b7dff28a64099985870fb41b -r076965b54ec7f9711537ad5553de65b4da11338e --- dialin/ui/hd_simulator_alarms.py (.../hd_simulator_alarms.py) (revision 786d24b238743698b7dff28a64099985870fb41b) +++ dialin/ui/hd_simulator_alarms.py (.../hd_simulator_alarms.py) (revision 076965b54ec7f9711537ad5553de65b4da11338e) @@ -17,9 +17,7 @@ from time import sleep, time from ..utils import YES, NO -from ..protocols.CAN import (DenaliMessage, - DenaliCanMessenger, - DenaliChannels) +from ..protocols.CAN import DenaliMessage, DenaliCanMessenger, DenaliChannels from logging import Logger from ..utils.base import AbstractSubSystem from ..utils.conversions import integer_to_bytearray, float_to_bytearray