jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-19 11:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return to previous alarm state after trigger (#2580)

Browse Source
This commit is contained in:
Tobie Booth 2016-08-05 14:05:43 -05:00 committed by Tobie Booth
parent 176a078b3c
commit 1e3f7ad9a4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
homeassistant/components/alarm_control_panel/manual.py
View File

@ -40,7 +40,7 @@ class ManualAlarm(alarm.AlarmControlPanel):
When armed, will be pending for 'pending_time', after that armed. When armed, will be pending for 'pending_time', after that armed.
When triggered, will be pending for 'trigger_time'. After that will be When triggered, will be pending for 'trigger_time'. After that will be
triggered for 'trigger_time', after that we return to disarmed. triggered for 'trigger_time', after that we return to the previous state.
""" """
def __init__(self, hass, name, code, pending_time, trigger_time): def __init__(self, hass, name, code, pending_time, trigger_time):
@ -51,6 +51,7 @@ class ManualAlarm(alarm.AlarmControlPanel):
self._code = str(code) if code else None self._code = str(code) if code else None
self._pending_time = datetime.timedelta(seconds=pending_time) self._pending_time = datetime.timedelta(seconds=pending_time)
self._trigger_time = datetime.timedelta(seconds=trigger_time) self._trigger_time = datetime.timedelta(seconds=trigger_time)
self._pre_trigger_state = self._state
self._state_ts = None self._state_ts = None
@property @property
@ -77,7 +78,7 @@ class ManualAlarm(alarm.AlarmControlPanel):
return STATE_ALARM_PENDING return STATE_ALARM_PENDING
elif (self._state_ts + self._pending_time + elif (self._state_ts + self._pending_time +
self._trigger_time) < dt_util.utcnow(): self._trigger_time) < dt_util.utcnow():
return STATE_ALARM_DISARMED return self._pre_trigger_state
return self._state return self._state
@ -125,6 +126,7 @@ class ManualAlarm(alarm.AlarmControlPanel):
def alarm_trigger(self, code=None): def alarm_trigger(self, code=None):
"""Send alarm trigger command. No code needed.""" """Send alarm trigger command. No code needed."""
self._pre_trigger_state = self._state
self._state = STATE_ALARM_TRIGGERED self._state = STATE_ALARM_TRIGGERED
self._state_ts = dt_util.utcnow() self._state_ts = dt_util.utcnow()
self.update_ha_state() self.update_ha_state()