diff --git a/homeassistant/components/concord232/alarm_control_panel.py b/homeassistant/components/concord232/alarm_control_panel.py index 4821e589b13..a209fba93ed 100644 --- a/homeassistant/components/concord232/alarm_control_panel.py +++ b/homeassistant/components/concord232/alarm_control_panel.py @@ -9,8 +9,8 @@ import homeassistant.components.alarm_control_panel as alarm 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 @@ _LOGGER = logging.getLogger(__name__) 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): cv.string, + vol.Optional(CONF_MODE, default=DEFAULT_MODE): cv.string, vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port, }) @@ -32,13 +35,15 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ 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 + self._mode = mode self._url = url self._alarm = concord232_client.Client(self._url) self._alarm.partitions = self._alarm.list_partitions() @@ -93,12 +100,35 @@ class Concord232Alarm(alarm.AlarmControlPanel): 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