From bc549e9525fc835c6b4e86606273763dfda89061 Mon Sep 17 00:00:00 2001 From: Alok Saboo Date: Mon, 21 Aug 2017 16:20:38 -0400 Subject: [PATCH] Use builtin constants for Abode alarm_control_panel (#9059) * Use builtin constants for alarm_control_panel * Made it consistent with other alarm panels * Replaced STATE_UNKNOWN with None --- .../components/alarm_control_panel/abode.py | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/homeassistant/components/alarm_control_panel/abode.py b/homeassistant/components/alarm_control_panel/abode.py index 0d4891cc277..7d7ce931c20 100644 --- a/homeassistant/components/alarm_control_panel/abode.py +++ b/homeassistant/components/alarm_control_panel/abode.py @@ -7,16 +7,14 @@ https://home-assistant.io/components/alarm_control_panel.abode/ import logging from homeassistant.components.abode import (DATA_ABODE, DEFAULT_NAME) -from homeassistant.const import (STATE_UNKNOWN) +from homeassistant.const import (STATE_ALARM_ARMED_AWAY, + STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED) import homeassistant.components.alarm_control_panel as alarm DEPENDENCIES = ['abode'] _LOGGER = logging.getLogger(__name__) -ALARM_STATE_HOME = 'home' -ALARM_STATE_STANDBY = 'standby' -ALARM_STATE_AWAY = 'away' ICON = 'mdi:security' @@ -54,26 +52,29 @@ class AbodeAlarm(alarm.AlarmControlPanel): @property def state(self): """Return the state of the device.""" - status = self._device.mode - - if status in [ALARM_STATE_STANDBY, ALARM_STATE_HOME, ALARM_STATE_AWAY]: - return status - - return STATE_UNKNOWN + if self._device.mode == "standby": + state = STATE_ALARM_DISARMED + elif self._device.mode == "away": + state = STATE_ALARM_ARMED_AWAY + elif self._device.mode == "home": + state = STATE_ALARM_ARMED_HOME + else: + state = None + return state def alarm_disarm(self, code=None): """Send disarm command.""" - self._device.set_mode(mode=ALARM_STATE_STANDBY) + self._device.set_standby() self.schedule_update_ha_state() def alarm_arm_home(self, code=None): """Send arm home command.""" - self._device.set_mode(mode=ALARM_STATE_HOME) + self._device.set_home() self.schedule_update_ha_state() def alarm_arm_away(self, code=None): """Send arm away command.""" - self._device.set_mode(mode=ALARM_STATE_AWAY) + self._device.set_away() self.schedule_update_ha_state() def update(self):