From c6e135ce22b7227025a24e56fcfd53119a748ab6 Mon Sep 17 00:00:00 2001 From: Raman Gupta <7243222+raman325@users.noreply.github.com> Date: Tue, 26 Nov 2019 20:02:36 -0500 Subject: [PATCH 1/3] update alarmdecoder service domain --- .../components/alarm_control_panel/services.yaml | 10 ---------- .../components/alarmdecoder/alarm_control_panel.py | 12 ++++++------ homeassistant/components/alarmdecoder/services.yaml | 10 ++++++++++ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/homeassistant/components/alarm_control_panel/services.yaml b/homeassistant/components/alarm_control_panel/services.yaml index 9abf2189ed3c65..bb43f2fa9f134f 100644 --- a/homeassistant/components/alarm_control_panel/services.yaml +++ b/homeassistant/components/alarm_control_panel/services.yaml @@ -70,16 +70,6 @@ envisalink_alarm_keypress: description: 'String to send to the alarm panel (1-6 characters).' example: '*71' -alarmdecoder_alarm_toggle_chime: - description: Send the alarm the toggle chime command. - fields: - entity_id: - description: Name of the alarm control panel to trigger. - example: 'alarm_control_panel.downstairs' - code: - description: A required code to toggle the alarm control panel chime with. - example: 1234 - ifttt_push_alarm_state: description: Update the alarm state to the specified value. fields: diff --git a/homeassistant/components/alarmdecoder/alarm_control_panel.py b/homeassistant/components/alarmdecoder/alarm_control_panel.py index f9bff3bfda7b62..141f091eb44b96 100644 --- a/homeassistant/components/alarmdecoder/alarm_control_panel.py +++ b/homeassistant/components/alarmdecoder/alarm_control_panel.py @@ -3,7 +3,7 @@ import voluptuous as vol -import homeassistant.components.alarm_control_panel as alarm +from homeassistant.components.alarm_control_panel import AlarmControlPanel, FORMAT_NUMBER from homeassistant.components.alarm_control_panel.const import ( SUPPORT_ALARM_ARM_AWAY, SUPPORT_ALARM_ARM_HOME, @@ -18,7 +18,7 @@ ) import homeassistant.helpers.config_validation as cv -from . import DATA_AD, DOMAIN as DOMAIN_ALARMDECODER, SIGNAL_PANEL_MESSAGE +from . import DATA_AD, DOMAIN, SIGNAL_PANEL_MESSAGE _LOGGER = logging.getLogger(__name__) @@ -41,7 +41,7 @@ def alarm_toggle_chime_handler(service): device.alarm_toggle_chime(code) hass.services.register( - alarm.DOMAIN, + DOMAIN, SERVICE_ALARM_TOGGLE_CHIME, alarm_toggle_chime_handler, schema=ALARM_TOGGLE_CHIME_SCHEMA, @@ -53,14 +53,14 @@ def alarm_keypress_handler(service): device.alarm_keypress(keypress) hass.services.register( - DOMAIN_ALARMDECODER, + DOMAIN, SERVICE_ALARM_KEYPRESS, alarm_keypress_handler, schema=ALARM_KEYPRESS_SCHEMA, ) -class AlarmDecoderAlarmPanel(alarm.AlarmControlPanel): +class AlarmDecoderAlarmPanel(AlarmControlPanel): """Representation of an AlarmDecoder-based alarm panel.""" def __init__(self): @@ -120,7 +120,7 @@ def should_poll(self): @property def code_format(self): """Return one or more digits/characters.""" - return alarm.FORMAT_NUMBER + return FORMAT_NUMBER @property def state(self): diff --git a/homeassistant/components/alarmdecoder/services.yaml b/homeassistant/components/alarmdecoder/services.yaml index 55451d42f13768..12268d48bb7121 100644 --- a/homeassistant/components/alarmdecoder/services.yaml +++ b/homeassistant/components/alarmdecoder/services.yaml @@ -7,3 +7,13 @@ alarm_keypress: keypress: description: 'String to send to the alarm panel.' example: '*71' + +alarm_toggle_chime: + description: Send the alarm the toggle chime command. + fields: + entity_id: + description: Name of the alarm control panel to trigger. + example: 'alarm_control_panel.downstairs' + code: + description: A required code to toggle the alarm control panel chime with. + example: 1234 From 2d3d04dab78fc4f4369fff2a51daf18a1c8969ea Mon Sep 17 00:00:00 2001 From: Raman Gupta <7243222+raman325@users.noreply.github.com> Date: Tue, 26 Nov 2019 20:04:36 -0500 Subject: [PATCH 2/3] update alarmdecoder service name --- homeassistant/components/alarmdecoder/alarm_control_panel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/alarmdecoder/alarm_control_panel.py b/homeassistant/components/alarmdecoder/alarm_control_panel.py index 141f091eb44b96..ee789186cce6d2 100644 --- a/homeassistant/components/alarmdecoder/alarm_control_panel.py +++ b/homeassistant/components/alarmdecoder/alarm_control_panel.py @@ -22,7 +22,7 @@ _LOGGER = logging.getLogger(__name__) -SERVICE_ALARM_TOGGLE_CHIME = "alarmdecoder_alarm_toggle_chime" +SERVICE_ALARM_TOGGLE_CHIME = "alarm_toggle_chime" ALARM_TOGGLE_CHIME_SCHEMA = vol.Schema({vol.Required(ATTR_CODE): cv.string}) SERVICE_ALARM_KEYPRESS = "alarm_keypress" From 651048aeec66f581601ef594865a994d2d719135 Mon Sep 17 00:00:00 2001 From: Raman Gupta <7243222+raman325@users.noreply.github.com> Date: Tue, 26 Nov 2019 20:12:50 -0500 Subject: [PATCH 3/3] black formatting --- homeassistant/components/alarmdecoder/alarm_control_panel.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/homeassistant/components/alarmdecoder/alarm_control_panel.py b/homeassistant/components/alarmdecoder/alarm_control_panel.py index ee789186cce6d2..d2e9fd136a8270 100644 --- a/homeassistant/components/alarmdecoder/alarm_control_panel.py +++ b/homeassistant/components/alarmdecoder/alarm_control_panel.py @@ -3,7 +3,10 @@ import voluptuous as vol -from homeassistant.components.alarm_control_panel import AlarmControlPanel, FORMAT_NUMBER +from homeassistant.components.alarm_control_panel import ( + AlarmControlPanel, + FORMAT_NUMBER, +) from homeassistant.components.alarm_control_panel.const import ( SUPPORT_ALARM_ARM_AWAY, SUPPORT_ALARM_ARM_HOME,