Index: leahi_dialin/ro/modules/levels.py =================================================================== diff -u -rc995ca1d69740f4219344c9c85cf3e332fdd9f22 -rdfbb4f080638b65d9836b22bd5c76d46d53abba5 --- leahi_dialin/ro/modules/levels.py (.../levels.py) (revision c995ca1d69740f4219344c9c85cf3e332fdd9f22) +++ leahi_dialin/ro/modules/levels.py (.../levels.py) (revision dfbb4f080638b65d9836b22bd5c76d46d53abba5) @@ -23,8 +23,16 @@ 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 -from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray +from leahi_dialin.utils.conversions import integer_to_bytearray +@unique +class ROFloaterLevels(DialinEnum): + LEVEL_STATE_LOW = 0 + LEVEL_STATE_HIGH = 1 + LEVEL_STATE_MEDIUM = 2 + LEVEL_STATE_ILLEGAL = 3 + + class ROLevels(AbstractSubSystem): """ @@ -98,7 +106,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_level_status_override(self, level_sensor: int, status: int, reset: int = NO_RESET) -> int: + def cmd_level_state_override(self, level: int, reset: int = NO_RESET) -> int: """ Constructs and sends level status override command. Must be logged into RO. @@ -109,9 +117,8 @@ @returns 1 if successful, zero otherwise """ reset_value = integer_to_bytearray(reset) - lvl = integer_to_bytearray(level_sensor) - sts = integer_to_bytearray(status) - payload = reset_value + sts + lvl + lvl = integer_to_bytearray(level) + payload = reset_value + lvl message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_ro_ch_id, message_id=MsgIds.MSG_ID_RO_LEVELS_STATUS_OVERRIDE_REQUEST.value, payload=payload)