diff --git a/homeassistant/components/alarmdecoder/__init__.py b/homeassistant/components/alarmdecoder/__init__.py index c70bcdcc45c..178f31ee87a 100644 --- a/homeassistant/components/alarmdecoder/__init__.py +++ b/homeassistant/components/alarmdecoder/__init__.py @@ -2,7 +2,7 @@ from datetime import timedelta import logging -from alarmdecoder import AlarmDecoder +from adext import AdExt from alarmdecoder.devices import SerialDevice, SocketDevice, USBDevice from alarmdecoder.util import NoDeviceError import voluptuous as vol @@ -189,13 +189,13 @@ def setup(hass, config): if device_type == "socket": host = device[CONF_HOST] port = device[CONF_DEVICE_PORT] - controller = AlarmDecoder(SocketDevice(interface=(host, port))) + controller = AdExt(SocketDevice(interface=(host, port))) elif device_type == "serial": path = device[CONF_DEVICE_PATH] baud = device[CONF_DEVICE_BAUD] - controller = AlarmDecoder(SerialDevice(interface=path)) + controller = AdExt(SerialDevice(interface=path)) elif device_type == "usb": - AlarmDecoder(USBDevice.find()) + AdExt(USBDevice.find()) return False controller.on_message += handle_message diff --git a/homeassistant/components/alarmdecoder/alarm_control_panel.py b/homeassistant/components/alarmdecoder/alarm_control_panel.py index ac90ea1796f..0e3fddd7f58 100644 --- a/homeassistant/components/alarmdecoder/alarm_control_panel.py +++ b/homeassistant/components/alarmdecoder/alarm_control_panel.py @@ -178,28 +178,27 @@ class AlarmDecoderAlarmPanel(AlarmControlPanelEntity): def alarm_arm_away(self, code=None): """Send arm away command.""" - if code: - if self._auto_bypass: - self.hass.data[DATA_AD].send(f"{code!s}6#") - self.hass.data[DATA_AD].send(f"{code!s}2") - elif not self._code_arm_required: - self.hass.data[DATA_AD].send("#2") + self.hass.data[DATA_AD].arm_away( + code=code, + code_arm_required=self._code_arm_required, + auto_bypass=self._auto_bypass, + ) def alarm_arm_home(self, code=None): """Send arm home command.""" - if code: - if self._auto_bypass: - self.hass.data[DATA_AD].send(f"{code!s}6#") - self.hass.data[DATA_AD].send(f"{code!s}3") - elif not self._code_arm_required: - self.hass.data[DATA_AD].send("#3") + self.hass.data[DATA_AD].arm_home( + code=code, + code_arm_required=self._code_arm_required, + auto_bypass=self._auto_bypass, + ) def alarm_arm_night(self, code=None): """Send arm night command.""" - if code: - self.hass.data[DATA_AD].send(f"{code!s}7") - elif not self._code_arm_required: - self.hass.data[DATA_AD].send("#7") + self.hass.data[DATA_AD].arm_night( + code=code, + code_arm_required=self._code_arm_required, + auto_bypass=self._auto_bypass, + ) def alarm_toggle_chime(self, code=None): """Send toggle chime command.""" diff --git a/homeassistant/components/alarmdecoder/manifest.json b/homeassistant/components/alarmdecoder/manifest.json index 48c5cb824ad..ea2c3fb01c8 100644 --- a/homeassistant/components/alarmdecoder/manifest.json +++ b/homeassistant/components/alarmdecoder/manifest.json @@ -2,6 +2,6 @@ "domain": "alarmdecoder", "name": "AlarmDecoder", "documentation": "https://www.home-assistant.io/integrations/alarmdecoder", - "requirements": ["alarmdecoder==1.13.2"], + "requirements": ["adext==0.3"], "codeowners": ["@ajschmidt8"] } diff --git a/requirements_all.txt b/requirements_all.txt index 67cb729e96a..d349b173d86 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -131,6 +131,9 @@ adafruit-circuitpython-mcp230xx==2.2.2 # homeassistant.components.androidtv adb-shell==0.1.3 +# homeassistant.components.alarmdecoder +adext==0.3 + # homeassistant.components.adguard adguardhome==0.4.2 @@ -235,9 +238,6 @@ airly==0.0.2 # homeassistant.components.aladdin_connect aladdin_connect==0.3 -# homeassistant.components.alarmdecoder -alarmdecoder==1.13.2 - # homeassistant.components.alpha_vantage alpha_vantage==2.2.0