From 98620d8ce848ded4de5d67e90d8333c0782a25bd Mon Sep 17 00:00:00 2001 From: Jeroen ter Heerdt Date: Thu, 22 Mar 2018 18:53:52 +0100 Subject: [PATCH] Fixing Egardia 'home armed' state not shown correctly. (#13335) * Fixing Egardia 'home armed' state not shown correctly. * Updating requirements_all. * Adding DEPEDENCY list to Egardia components. * updating requirements_all --- homeassistant/components/alarm_control_panel/egardia.py | 7 +++++-- homeassistant/components/binary_sensor/egardia.py | 2 +- homeassistant/components/egardia.py | 2 +- requirements_all.txt | 3 +-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/homeassistant/components/alarm_control_panel/egardia.py b/homeassistant/components/alarm_control_panel/egardia.py index 845eb81bbe0..f0db378ec15 100644 --- a/homeassistant/components/alarm_control_panel/egardia.py +++ b/homeassistant/components/alarm_control_panel/egardia.py @@ -12,13 +12,14 @@ import requests import homeassistant.components.alarm_control_panel as alarm from homeassistant.const import ( STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME, - STATE_ALARM_ARMED_AWAY, STATE_ALARM_TRIGGERED) + STATE_ALARM_ARMED_AWAY, STATE_ALARM_TRIGGERED, + STATE_ALARM_ARMED_NIGHT) from homeassistant.components.egardia import ( EGARDIA_DEVICE, EGARDIA_SERVER, REPORT_SERVER_CODES_IGNORE, CONF_REPORT_SERVER_CODES, CONF_REPORT_SERVER_ENABLED, CONF_REPORT_SERVER_PORT ) -REQUIREMENTS = ['pythonegardia==1.0.38'] +DEPENDENCIES = ['egardia'] _LOGGER = logging.getLogger(__name__) @@ -27,6 +28,8 @@ STATES = { 'DAY HOME': STATE_ALARM_ARMED_HOME, 'DISARM': STATE_ALARM_DISARMED, 'ARMHOME': STATE_ALARM_ARMED_HOME, + 'HOME': STATE_ALARM_ARMED_HOME, + 'NIGHT HOME': STATE_ALARM_ARMED_NIGHT, 'TRIGGERED': STATE_ALARM_TRIGGERED } diff --git a/homeassistant/components/binary_sensor/egardia.py b/homeassistant/components/binary_sensor/egardia.py index ab88de9d3c9..76d90e78376 100644 --- a/homeassistant/components/binary_sensor/egardia.py +++ b/homeassistant/components/binary_sensor/egardia.py @@ -12,7 +12,7 @@ from homeassistant.const import STATE_ON, STATE_OFF from homeassistant.components.egardia import ( EGARDIA_DEVICE, ATTR_DISCOVER_DEVICES) _LOGGER = logging.getLogger(__name__) - +DEPENDENCIES = ['egardia'] EGARDIA_TYPE_TO_DEVICE_CLASS = {'IR Sensor': 'motion', 'Door Contact': 'opening', 'IR': 'motion'} diff --git a/homeassistant/components/egardia.py b/homeassistant/components/egardia.py index 2cfc44a407b..f350ea56bb4 100644 --- a/homeassistant/components/egardia.py +++ b/homeassistant/components/egardia.py @@ -15,7 +15,7 @@ from homeassistant.const import ( CONF_PORT, CONF_HOST, CONF_PASSWORD, CONF_USERNAME, CONF_NAME, EVENT_HOMEASSISTANT_STOP) -REQUIREMENTS = ['pythonegardia==1.0.38'] +REQUIREMENTS = ['pythonegardia==1.0.39'] _LOGGER = logging.getLogger(__name__) diff --git a/requirements_all.txt b/requirements_all.txt index 793403f26d7..837770d7c11 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -1006,8 +1006,7 @@ python_opendata_transport==0.0.3 python_openzwave==0.4.3 # homeassistant.components.egardia -# homeassistant.components.alarm_control_panel.egardia -pythonegardia==1.0.38 +pythonegardia==1.0.39 # homeassistant.components.sensor.whois pythonwhois==2.4.3