Index: dialin/hd/alarms.py =================================================================== diff -u -rcb130637058af1a50ece54c74965099f3ac4a9b1 -r573f632dcc74a7979eb80c18caffdced3c176c90 --- dialin/hd/alarms.py (.../alarms.py) (revision cb130637058af1a50ece54c74965099f3ac4a9b1) +++ dialin/hd/alarms.py (.../alarms.py) (revision 573f632dcc74a7979eb80c18caffdced3c176c90) @@ -461,7 +461,7 @@ """ return self.alarm_data[alarm_id] - @publish(["hd_alarm_status_timestamp", "alarms_state", "alarm_top", "alarms_silence_expires_in", "alarms_escalates_in", "alarms_flags"]) + @publish(["hd_alarm_status_timestamp", "alarms_priority_state", "alarm_top", "alarms_silence_expires_in", "alarms_escalates_in", "alarms_flags"]) def _handler_alarms_status_sync(self, message, timestamp=0.0): """ Handles published alarms status messages. alarms status data are captured Index: dialin/hd/reservoirs.py =================================================================== diff -u -r68197254bdb86290c04a7cf222ae123970fd7cdb -r573f632dcc74a7979eb80c18caffdced3c176c90 --- dialin/hd/reservoirs.py (.../reservoirs.py) (revision 68197254bdb86290c04a7cf222ae123970fd7cdb) +++ dialin/hd/reservoirs.py (.../reservoirs.py) (revision 573f632dcc74a7979eb80c18caffdced3c176c90) @@ -95,16 +95,19 @@ self.hd_reservoirs_timestamp = timestamp - def cmd_recirulation_pct_override(self, recirulation_pct: float) -> int: + def cmd_recirulation_pct_override(self, recirulation_pct: float, reset: int) -> int: """ Constructs and sends a recirulation percentage override message to the HD. Constraints: Must be logged into HD. + @param recirulation_pct: (float) recirulation percentage value + @param reset: (int) - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ + rst = integer_to_bytearray(reset) pct = float_to_bytearray(recirulation_pct) - payload = pct + payload = rst + pct message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, message_id=MsgIds.MSG_ID_HD_RECIRULATION_PCT_OVERRIDE.value,