Index: leahi_dialin/ro/modules/boost_pump.py =================================================================== diff -u -r8c0c7ee456674a5b9c7c407cc03deee0c23993f2 -r557a20a04e6dde63be189809971f9ecfb341fb67 --- leahi_dialin/ro/modules/boost_pump.py (.../boost_pump.py) (revision 8c0c7ee456674a5b9c7c407cc03deee0c23993f2) +++ leahi_dialin/ro/modules/boost_pump.py (.../boost_pump.py) (revision 557a20a04e6dde63be189809971f9ecfb341fb67) @@ -14,15 +14,20 @@ # ############################################################################ import struct +from enum import unique from logging import Logger from .constants import RESET, NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels -from leahi_dialin.utils.base import AbstractSubSystem, publish +from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum from leahi_dialin.utils.checks import check_broadcast_interval_override_ms from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray +@unique +class ROPumpNames(DialinEnum): + PUMP_RO = 0 + PUMP_BOOSTER = 1 class ROPumps(AbstractSubSystem): """ Index: leahi_dialin/ro/modules/valves.py =================================================================== diff -u -r4ef1f9521c81e763573383b62e7ff184b9c8a889 -r557a20a04e6dde63be189809971f9ecfb341fb67 --- leahi_dialin/ro/modules/valves.py (.../valves.py) (revision 4ef1f9521c81e763573383b62e7ff184b9c8a889) +++ leahi_dialin/ro/modules/valves.py (.../valves.py) (revision 557a20a04e6dde63be189809971f9ecfb341fb67) @@ -218,15 +218,15 @@ self.logger.debug("Timeout!!!!") return False - def cmd_valve_override(self, valve: int, state: bool, reset: int = NO_RESET) -> int: + def cmd_valve_override(self, valve: int, state: int, reset: int = NO_RESET) -> int: """ Constructs and sends the valve state override command. Constraints: Must be logged into RO. Given valve ID must be one of the valve IDs listed below. @param valve: unsigned int - valve ID - @param state: bool - valve state + @param state: int - valve state @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """