Fixed status reporting and expose new modes (arm night, arm max)

homeassistant/components/alarm_control_panel/__init__.py

@@ -13,7 +13,8 @@
 from homeassistant.const import (
     ATTR_CODE, ATTR_CODE_FORMAT, ATTR_ENTITY_ID, SERVICE_ALARM_TRIGGER,
     SERVICE_ALARM_DISARM, SERVICE_ALARM_ARM_HOME, SERVICE_ALARM_ARM_AWAY,
-    SERVICE_ALARM_ARM_NIGHT, SERVICE_ALARM_ARM_CUSTOM_BYPASS)
+    SERVICE_ALARM_ARM_NIGHT, SERVICE_ALARM_ARM_MAX,
+    SERVICE_ALARM_ARM_CUSTOM_BYPASS)
 from homeassistant.loader import bind_hass
 from homeassistant.helpers.config_validation import PLATFORM_SCHEMA  # noqa
 import homeassistant.helpers.config_validation as cv
@@ -31,6 +32,7 @@
     SERVICE_ALARM_ARM_HOME: 'alarm_arm_home',
     SERVICE_ALARM_ARM_AWAY: 'alarm_arm_away',
     SERVICE_ALARM_ARM_NIGHT: 'alarm_arm_night',
+    SERVICE_ALARM_ARM_MAX: 'alarm_arm_max',
     SERVICE_ALARM_ARM_CUSTOM_BYPASS: 'alarm_arm_custom_bypass',
     SERVICE_ALARM_TRIGGER: 'alarm_trigger'
 }
@@ -94,6 +96,18 @@ def alarm_arm_night(hass, code=None, entity_id=None):
     hass.services.call(DOMAIN, SERVICE_ALARM_ARM_NIGHT, data)
 
 
+@bind_hass
+def alarm_arm_max(hass, code=None, entity_id=None):
+    """Send the alarm the command for arm max."""
+    data = {}
+    if code:
+        data[ATTR_CODE] = code
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_ALARM_ARM_MAX, data)
+
+
 @bind_hass
 def alarm_trigger(hass, code=None, entity_id=None):
     """Send the alarm the command for trigger."""

homeassistant/components/alarm_control_panel/envisalink.py

@@ -17,8 +17,10 @@
     DATA_EVL, EnvisalinkDevice, PARTITION_SCHEMA, CONF_CODE, CONF_PANIC,
     CONF_PARTITIONNAME, SIGNAL_KEYPAD_UPDATE, SIGNAL_PARTITION_UPDATE)
 from homeassistant.const import (
-    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED,
-    STATE_UNKNOWN, STATE_ALARM_TRIGGERED, STATE_ALARM_PENDING, ATTR_ENTITY_ID)
+    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMED_MAX, STATE_ALARM_DISARMED, STATE_UNKNOWN,
+    STATE_ALARM_ARMING, STATE_ALARM_TRIGGERED, STATE_ALARM_PENDING,
+    ATTR_ENTITY_ID)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -115,15 +117,23 @@ def state(self):
 
         if self._info['status']['alarm']:
             state = STATE_ALARM_TRIGGERED
-        elif self._info['status']['armed_away']:
-            state = STATE_ALARM_ARMED_AWAY
-        elif self._info['status']['armed_stay']:
-            state = STATE_ALARM_ARMED_HOME
         elif self._info['status']['exit_delay']:
-            state = STATE_ALARM_PENDING
+            state = STATE_ALARM_ARMING
         elif self._info['status']['entry_delay']:
             state = STATE_ALARM_PENDING
-        elif self._info['status']['alpha']:
+        elif self._info['status']['armed_away'] and
+        not self._info['status']['armed_zero_entry_delay']:
+            state = STATE_ALARM_ARMED_AWAY
+        elif self._info['status']['armed_away'] and
+        self._info['status']['armed_zero_entry_delay']:
+            state = STATE_ALARM_ARMED_MAX
+        elif self._info['status']['armed_stay'] and
+        not self._info['status']['armed_zero_entry_delay']:
+            state = STATE_ALARM_ARMED_HOME
+        elif self._info['status']['armed_stay'] and
+        self._info['status']['armed_zero_entry_delay']:
+            state = STATE_ALARM_ARMED_NIGHT
+        elif self._info['status']['ready']:
             state = STATE_ALARM_DISARMED
         return state
 
@@ -147,6 +157,26 @@ def async_alarm_arm_home(self, code=None):
             self.hass.data[DATA_EVL].arm_stay_partition(
                 str(self._code), self._partition_number)
 
+    @asyncio.coroutine
+    def async_alarm_arm_night(self, code=None):
+        """Send arm night command."""
+        if code:
+            self.hass.data[DATA_EVL].arm_night_partition(
+                str(code), self._partition_number)
+        else:
+            self.hass.data[DATA_EVL].arm_night_partition(
+                str(self._code), self._partition_number)
+
+    @asyncio.coroutine
+    def async_alarm_arm_max(self, code=None):
+        """Send arm max command."""
+        if code:
+            self.hass.data[DATA_EVL].arm_max_partition(
+                str(code), self._partition_number)
+        else:
+            self.hass.data[DATA_EVL].arm_max_partition(
+                str(self._code), self._partition_number)
+
     @asyncio.coroutine
     def async_alarm_arm_away(self, code=None):
         """Send arm away command."""

homeassistant/components/alarm_control_panel/services.yaml

@@ -40,6 +40,16 @@ alarm_arm_night:
       description: An optional code to arm night the alarm control panel with.
       example: 1234
 
+alarm_arm_max:
+  description: Send the alarm the command for arm max.
+  fields:
+    entity_id:
+      description: Name of alarm control panel to arm max.
+      example: 'alarm_control_panel.downstairs'
+    code:
+      description: An optional code to arm max the alarm control panel with.
+      example: 1234
+
 alarm_trigger:
   description: Send the alarm the command for trigger.
   fields:

homeassistant/components/envisalink.py

@@ -16,7 +16,7 @@
 from homeassistant.helpers.discovery import async_load_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 
-REQUIREMENTS = ['pyenvisalink==2.3']
+REQUIREMENTS = ['pyenvisalink==2.4']
 
 _LOGGER = logging.getLogger(__name__)
 

homeassistant/const.py

@@ -190,6 +190,7 @@
 STATE_ALARM_ARMED_HOME = 'armed_home'
 STATE_ALARM_ARMED_AWAY = 'armed_away'
 STATE_ALARM_ARMED_NIGHT = 'armed_night'
+STATE_ALARM_ARMED_MAX = 'armed_max'
 STATE_ALARM_ARMED_CUSTOM_BYPASS = 'armed_custom_bypass'
 STATE_ALARM_PENDING = 'pending'
 STATE_ALARM_ARMING = 'arming'
@@ -358,6 +359,7 @@
 SERVICE_ALARM_ARM_HOME = 'alarm_arm_home'
 SERVICE_ALARM_ARM_AWAY = 'alarm_arm_away'
 SERVICE_ALARM_ARM_NIGHT = 'alarm_arm_night'
+SERVICE_ALARM_ARM_MAX = 'alarm_arm_max'
 SERVICE_ALARM_ARM_CUSTOM_BYPASS = 'alarm_arm_custom_bypass'
 SERVICE_ALARM_TRIGGER = 'alarm_trigger'
 

requirements_all.txt

@@ -832,7 +832,7 @@ pyeight==0.0.9
 pyemby==1.5
 
 # homeassistant.components.envisalink
-pyenvisalink==2.3
+pyenvisalink==2.4
 
 # homeassistant.components.climate.ephember
 pyephember==0.2.0