Skip to content

Use "arming" state during transition in manual alarm panel #32950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MartinHjelmare merged 23 commits into from
Apr 23, 2020
Merged

Use "arming" state during transition in manual alarm panel #32950

Changes from 2 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
3630aab
Manual Alarm Control Panel: use proper "Arming" state
starkillerOG Mar 18, 2020
3567396
Update previous and next attributes
starkillerOG Mar 20, 2020
cec4907
add CONF_ARMING_TIME
starkillerOG Mar 22, 2020
daa4984
Split up arming and pending time, pending_time --> arming_time
starkillerOG Mar 22, 2020
ff28352
update tests
starkillerOG Mar 22, 2020
e19d965
fix issort
starkillerOG Mar 22, 2020
6f80716
fix issort
starkillerOG Mar 22, 2020
48d30f6
fix demo platform
starkillerOG Mar 22, 2020
af82553
fix alarm test
starkillerOG Mar 22, 2020
ed2c8ad
remove arming_time from the triggered state
starkillerOG Mar 28, 2020
0e09394
Match previous default "delay_time"
starkillerOG Mar 28, 2020
b02ab1e
fix tests
starkillerOG Mar 28, 2020
df94b2e
fix arming state when triggering
starkillerOG Mar 28, 2020
483d776
fix arming _arming_time_by_state for Triggering state
starkillerOG Mar 28, 2020
22ee780
change to not in list
starkillerOG Mar 28, 2020
17f5d34
Update homeassistant/components/manual/alarm_control_panel.py
starkillerOG Apr 17, 2020
536fc9b
async_update_ha_state -> async_write_ha_state
starkillerOG Apr 17, 2020
8f41e76
black formatting
starkillerOG Apr 17, 2020
471ea54
add Callback
starkillerOG Apr 18, 2020
3aafcf8
import callback
starkillerOG Apr 18, 2020
3675069
update device triggers alarm_control_panel
starkillerOG Apr 21, 2020
ffe5616
Update test_device_trigger.py
starkillerOG Apr 21, 2020
85a12ad
Update device_trigger.py
starkillerOG Apr 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions homeassistant/components/manual/alarm_control_panel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
STATE_ALARM_ARMED_CUSTOM_BYPASS,
STATE_ALARM_ARMED_HOME,
STATE_ALARM_ARMED_NIGHT,
STATE_ALARM_ARMING,
STATE_ALARM_DISARMED,
STATE_ALARM_PENDING,
STATE_ALARM_TRIGGERED,
Expand Down Expand Up @@ -63,8 +64,8 @@
state for state in SUPPORTED_STATES if state != STATE_ALARM_DISARMED
]

ATTR_PRE_PENDING_STATE = "pre_pending_state"
ATTR_POST_PENDING_STATE = "post_pending_state"
ATTR_PREVIOUS_STATE = "previous_state"
ATTR_NEXT_STATE = "next_state"


def _state_validator(config):
Expand Down Expand Up @@ -237,7 +238,7 @@ def state(self):
if self._state in SUPPORTED_PENDING_STATES and self._within_pending_time(
self._state
):
return STATE_ALARM_PENDING
return STATE_ALARM_ARMING

return self._state

Expand All @@ -255,7 +256,7 @@ def supported_features(self) -> int:
@property
def _active_state(self):
"""Get the current state."""
if self.state == STATE_ALARM_PENDING:
if self.state == STATE_ALARM_PENDING or self.state == STATE_ALARM_ARMING:
Comment thread
starkillerOG marked this conversation as resolved.
Outdated
return self._previous_state
return self._state

Expand Down Expand Up @@ -385,9 +386,9 @@ def device_state_attributes(self):
"""Return the state attributes."""
state_attr = {}

if self.state == STATE_ALARM_PENDING:
state_attr[ATTR_PRE_PENDING_STATE] = self._previous_state
Comment thread
starkillerOG marked this conversation as resolved.
state_attr[ATTR_POST_PENDING_STATE] = self._state
if self.state == STATE_ALARM_PENDING or self.state == STATE_ALARM_ARMING:
state_attr[ATTR_PREVIOUS_STATE] = self._previous_state
state_attr[ATTR_NEXT_STATE] = self._state

return state_attr

Expand All @@ -397,12 +398,15 @@ async def async_added_to_hass(self):
state = await self.async_get_last_state()
if state:
if (
state.state == STATE_ALARM_PENDING
(
state.state == STATE_ALARM_PENDING
or state.state == STATE_ALARM_ARMING
)
and hasattr(state, "attributes")
and state.attributes["pre_pending_state"]
and state.attributes[ATTR_PREVIOUS_STATE]
):
# If in pending state, we return to the pre_pending_state
self._state = state.attributes["pre_pending_state"]
# If in pending state, we return to the ATTR_PREVIOUS_STATE
self._state = state.attributes[ATTR_PREVIOUS_STATE]
self._state_ts = dt_util.utcnow()
else:
self._state = state.state
Expand Down