Index: leahi_dialin/fp/modules/levels.py =================================================================== diff -u -r72c423da1d07c40699f40b5da5bee6d992d3082c -reb02c56e88faeeda46ed62b1c0ec841dca0b9aba --- leahi_dialin/fp/modules/levels.py (.../levels.py) (revision 72c423da1d07c40699f40b5da5bee6d992d3082c) +++ leahi_dialin/fp/modules/levels.py (.../levels.py) (revision eb02c56e88faeeda46ed62b1c0ec841dca0b9aba) @@ -91,7 +91,7 @@ payload = reset_value + interval_value message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, - message_id=MsgIds.MSG_ID_RO_LEVEL_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, + message_id=MsgIds.MSG_ID_RO_LEVELS_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, payload=payload) self.logger.debug("Sending {} ms publish interval to the FP Levels module".format(ms)) @@ -106,20 +106,21 @@ self.logger.debug("Timeout!!!!") return False - def cmd_level_status_override(self, status: int, reset: int = NO_RESET) -> int: + def cmd_level_status_override(self, level_sensor: int, status: int, reset: int = NO_RESET) -> int: """ Constructs and sends level status override command. Must be logged into FP. + @param level_sensor: integer - the level sensor to override its value @param status: integer - the status value to override @param reset: (int) 1 to reset a previous override, 0 to override @returns 1 if successful, zero otherwise """ reset_value = integer_to_bytearray(reset) - sts = integer_to_bytearray(status) - payload = reset_value + sts + lvl = integer_to_bytearray(level) + payload = reset_value + lvl message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, - message_id=MsgIds.MSG_ID_RO_LEVEL_OVERRIDE_REQUEST.value, + message_id=MsgIds.MSG_ID_RO_LEVELS_STATUS_OVERRIDE_REQUEST.value, payload=payload) # Send message