Fix another manual alarm regression
This commit is contained in:
1 parent
2dd77f9477
commit
5dfd0d2502
2 files changed
+10
-8
No files matched your search
@@ -76,9 +76,10 @@ class ManualAlarm(alarm.AlarmControlPanel):
|
||||
return STATE_ALARM_PENDING
|
||||
|
||||
if self._state == STATE_ALARM_TRIGGERED and self._trigger_time:
|
||||
if self._state_ts + self._trigger_time > dt_util.utcnow():
|
||||
if self._state_ts + self._pending_time > dt_util.utcnow():
|
||||
return STATE_ALARM_PENDING
|
||||
elif dt_util.utcnow() >= self._state_ts + (2 * self._trigger_time):
|
||||
elif (self._state_ts + self._pending_time +
|
||||
self._trigger_time) < dt_util.utcnow():
|
||||
return STATE_ALARM_DISARMED
|
||||
|
||||
return self._state
|
||||
@@ -134,11 +135,11 @@ class ManualAlarm(alarm.AlarmControlPanel):
|
||||
if self._trigger_time:
|
||||
track_point_in_time(
|
||||
self._hass, self.update_ha_state,
|
||||
self._state_ts + self._trigger_time)
|
||||
self._state_ts + self._pending_time)
|
||||
|
||||
track_point_in_time(
|
||||
self._hass, self.update_ha_state,
|
||||
self._state_ts + 2 * self._trigger_time)
|
||||
self._state_ts + self._pending_time + self._trigger_time)
|
||||
|
||||
def _validate_code(self, code, state):
|
||||
""" Validate given code. """
|
||||
|
||||
Reference in new issue
Block a user