Merge pull request #2734 from tobiebooth/manual-alarm-improvements

Return to previous alarm state after trigger (#2580)
This commit is contained in:
Paulus Schoutsen authored and GitHub committed 2016-08-15 22:10:32 -07:00
commit 7594cf3c94
4 files changed
+93 -22

No files matched your search

+5 -1
View File
@@ -26,7 +26,9 @@ CONF_API_KEY = 'api_key'
CONF_BEFORE = 'before'
CONF_BELOW = 'below'
CONF_CONDITION = 'condition'
CONF_CODE = 'code'
CONF_CUSTOMIZE = 'customize'
CONF_DISARM_AFTER_TRIGGER = 'disarm_after_trigger'
CONF_ELEVATION = 'elevation'
CONF_ENTITY_ID = 'entity_id'
CONF_ENTITY_NAMESPACE = 'entity_namespace'
@@ -42,13 +44,15 @@ CONF_NAME = 'name'
CONF_OFFSET = 'offset'
CONF_OPTIMISTIC = 'optimistic'
CONF_PASSWORD = 'password'
CONF_PENDING_TIME = 'pending_time'
CONF_PLATFORM = 'platform'
CONF_PORT = 'port'
CONF_SCAN_INTERVAL = 'scan_interval'
CONF_STATE = 'state'
CONF_TEMPERATURE_UNIT = 'temperature_unit'
CONF_UNIT_SYSTEM = 'unit_system'
CONF_TIME_ZONE = 'time_zone'
CONF_TRIGGER_TIME = 'trigger_time'
CONF_UNIT_SYSTEM = 'unit_system'
CONF_USERNAME = 'username'
CONF_VALUE_TEMPLATE = 'value_template'
CONF_WEEKDAY = 'weekday'