From 90a89d51a3f9cee9e8991c752036a900d9f1e6f5 Mon Sep 17 00:00:00 2001 From: John Raahauge Date: Sun, 7 Apr 2019 13:10:06 -0700 Subject: [PATCH 1/5] Bugfix - binary_sensor.py --- homeassistant/components/concord232/binary_sensor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/concord232/binary_sensor.py b/homeassistant/components/concord232/binary_sensor.py index 5aff0f09983c38..c1a31eb9ead989 100644 --- a/homeassistant/components/concord232/binary_sensor.py +++ b/homeassistant/components/concord232/binary_sensor.py @@ -74,7 +74,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None): ) ) - add_entities(sensors, True) + add_entities(sensors, True) def get_opening_type(zone): From 841341ffba6a9a3620a53ddcc31a7adc0289a7fb Mon Sep 17 00:00:00 2001 From: John Raahauge Date: Sun, 7 Apr 2019 18:51:12 -0700 Subject: [PATCH 2/5] Added features to Concord232 Alarm Panel --- .../concord232/alarm_control_panel.py | 40 ++++++++++++++++--- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/homeassistant/components/concord232/alarm_control_panel.py b/homeassistant/components/concord232/alarm_control_panel.py index 4821e589b13ed1..8aaaf7edfbffe1 100644 --- a/homeassistant/components/concord232/alarm_control_panel.py +++ b/homeassistant/components/concord232/alarm_control_panel.py @@ -9,8 +9,8 @@ import homeassistant.helpers.config_validation as cv from homeassistant.components.alarm_control_panel import PLATFORM_SCHEMA from homeassistant.const import ( - CONF_HOST, CONF_NAME, CONF_PORT, STATE_ALARM_ARMED_AWAY, - STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED) + CONF_HOST, CONF_NAME, CONF_PORT, CONF_CODE, CONF_MODE, + STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED) REQUIREMENTS = ['concord232==0.15'] @@ -19,12 +19,15 @@ DEFAULT_HOST = 'localhost' DEFAULT_NAME = 'CONCORD232' DEFAULT_PORT = 5007 +DEFAULT_MODE = 'audible' SCAN_INTERVAL = datetime.timedelta(seconds=10) PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string, vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string, + vol.Optional(CONF_CODE, 'code validation'): cv.string, + vol.Optional(CONF_MODE, default=DEFAULT_MODE): cv.string, vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port, }) @@ -32,13 +35,15 @@ def setup_platform(hass, config, add_entities, discovery_info=None): """Set up the Concord232 alarm control panel platform.""" name = config.get(CONF_NAME) + code = config.get(CONF_CODE) + mode = config.get(CONF_MODE) host = config.get(CONF_HOST) port = config.get(CONF_PORT) url = 'http://{}:{}'.format(host, port) try: - add_entities([Concord232Alarm(url, name)], True) + add_entities([Concord232Alarm(url, name, code, mode)], True) except requests.exceptions.ConnectionError as ex: _LOGGER.error("Unable to connect to Concord232: %s", str(ex)) @@ -46,12 +51,14 @@ def setup_platform(hass, config, add_entities, discovery_info=None): class Concord232Alarm(alarm.AlarmControlPanel): """Representation of the Concord232-based alarm panel.""" - def __init__(self, url, name): + def __init__(self, url, name, code, mode): """Initialize the Concord232 alarm panel.""" from concord232 import client as concord232_client self._state = None self._name = name + self._code = code or None + self._mode = mode self._url = url self._alarm = concord232_client.Client(self._url) self._alarm.partitions = self._alarm.list_partitions() @@ -93,12 +100,35 @@ def update(self): def alarm_disarm(self, code=None): """Send disarm command.""" + if not self._validate_code(code, STATE_ALARM_DISARMED): + return self._alarm.disarm(code) def alarm_arm_home(self, code=None): """Send arm home command.""" - self._alarm.arm('stay') + if not self._validate_code(code, STATE_ALARM_ARMED_HOME): + return + if self._mode == 'silent': + self._alarm.arm('stay', 'silent') + else: + self._alarm.arm('stay') def alarm_arm_away(self, code=None): """Send arm away command.""" + if not self._validate_code(code, STATE_ALARM_ARMED_AWAY): + return self._alarm.arm('away') + + def _validate_code(self, code, state): + """Validate given code.""" + if self._code is None: + return True + if isinstance(self._code, str): + alarm_code = self._code + else: + alarm_code = self._code.render(from_state=self._state, + to_state=state) + check = not alarm_code or code == alarm_code + if not check: + _LOGGER.warning("Invalid code given for %s", state) + return check \ No newline at end of file From 880d7c35e018121d7e9458568115fdee79e3ef0f Mon Sep 17 00:00:00 2001 From: John Raahauge Date: Sun, 7 Apr 2019 19:27:31 -0700 Subject: [PATCH 3/5] Added New Line End Of File --- homeassistant/components/concord232/alarm_control_panel.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/homeassistant/components/concord232/alarm_control_panel.py b/homeassistant/components/concord232/alarm_control_panel.py index 8aaaf7edfbffe1..c7e936567e26d9 100644 --- a/homeassistant/components/concord232/alarm_control_panel.py +++ b/homeassistant/components/concord232/alarm_control_panel.py @@ -131,4 +131,5 @@ def _validate_code(self, code, state): check = not alarm_code or code == alarm_code if not check: _LOGGER.warning("Invalid code given for %s", state) - return check \ No newline at end of file + return check + \ No newline at end of file From e9836e13979d7bfd111b1415d396e6134c5e50ad Mon Sep 17 00:00:00 2001 From: John Raahauge Date: Sun, 7 Apr 2019 20:03:34 -0700 Subject: [PATCH 4/5] Deleted Whitespace --- homeassistant/components/concord232/alarm_control_panel.py | 1 - 1 file changed, 1 deletion(-) diff --git a/homeassistant/components/concord232/alarm_control_panel.py b/homeassistant/components/concord232/alarm_control_panel.py index c7e936567e26d9..62bb9efc4b0ab7 100644 --- a/homeassistant/components/concord232/alarm_control_panel.py +++ b/homeassistant/components/concord232/alarm_control_panel.py @@ -132,4 +132,3 @@ def _validate_code(self, code, state): if not check: _LOGGER.warning("Invalid code given for %s", state) return check - \ No newline at end of file From 7a17f51ecba76eb8374397f5a5b22ce60170dab1 Mon Sep 17 00:00:00 2001 From: John Raahauge Date: Mon, 8 Apr 2019 00:15:12 -0700 Subject: [PATCH 5/5] Back to original Removed added feature and sticking to bugfix --- .../concord232/alarm_control_panel.py | 40 +++---------------- 1 file changed, 5 insertions(+), 35 deletions(-) diff --git a/homeassistant/components/concord232/alarm_control_panel.py b/homeassistant/components/concord232/alarm_control_panel.py index 62bb9efc4b0ab7..4821e589b13ed1 100644 --- a/homeassistant/components/concord232/alarm_control_panel.py +++ b/homeassistant/components/concord232/alarm_control_panel.py @@ -9,8 +9,8 @@ import homeassistant.helpers.config_validation as cv from homeassistant.components.alarm_control_panel import PLATFORM_SCHEMA from homeassistant.const import ( - CONF_HOST, CONF_NAME, CONF_PORT, CONF_CODE, CONF_MODE, - STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED) + CONF_HOST, CONF_NAME, CONF_PORT, STATE_ALARM_ARMED_AWAY, + STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED) REQUIREMENTS = ['concord232==0.15'] @@ -19,15 +19,12 @@ DEFAULT_HOST = 'localhost' DEFAULT_NAME = 'CONCORD232' DEFAULT_PORT = 5007 -DEFAULT_MODE = 'audible' SCAN_INTERVAL = datetime.timedelta(seconds=10) PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string, vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string, - vol.Optional(CONF_CODE, 'code validation'): cv.string, - vol.Optional(CONF_MODE, default=DEFAULT_MODE): cv.string, vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port, }) @@ -35,15 +32,13 @@ def setup_platform(hass, config, add_entities, discovery_info=None): """Set up the Concord232 alarm control panel platform.""" name = config.get(CONF_NAME) - code = config.get(CONF_CODE) - mode = config.get(CONF_MODE) host = config.get(CONF_HOST) port = config.get(CONF_PORT) url = 'http://{}:{}'.format(host, port) try: - add_entities([Concord232Alarm(url, name, code, mode)], True) + add_entities([Concord232Alarm(url, name)], True) except requests.exceptions.ConnectionError as ex: _LOGGER.error("Unable to connect to Concord232: %s", str(ex)) @@ -51,14 +46,12 @@ def setup_platform(hass, config, add_entities, discovery_info=None): class Concord232Alarm(alarm.AlarmControlPanel): """Representation of the Concord232-based alarm panel.""" - def __init__(self, url, name, code, mode): + def __init__(self, url, name): """Initialize the Concord232 alarm panel.""" from concord232 import client as concord232_client self._state = None self._name = name - self._code = code or None - self._mode = mode self._url = url self._alarm = concord232_client.Client(self._url) self._alarm.partitions = self._alarm.list_partitions() @@ -100,35 +93,12 @@ def update(self): def alarm_disarm(self, code=None): """Send disarm command.""" - if not self._validate_code(code, STATE_ALARM_DISARMED): - return self._alarm.disarm(code) def alarm_arm_home(self, code=None): """Send arm home command.""" - if not self._validate_code(code, STATE_ALARM_ARMED_HOME): - return - if self._mode == 'silent': - self._alarm.arm('stay', 'silent') - else: - self._alarm.arm('stay') + self._alarm.arm('stay') def alarm_arm_away(self, code=None): """Send arm away command.""" - if not self._validate_code(code, STATE_ALARM_ARMED_AWAY): - return self._alarm.arm('away') - - def _validate_code(self, code, state): - """Validate given code.""" - if self._code is None: - return True - if isinstance(self._code, str): - alarm_code = self._code - else: - alarm_code = self._code.render(from_state=self._state, - to_state=state) - check = not alarm_code or code == alarm_code - if not check: - _LOGGER.warning("Invalid code given for %s", state) - return check