feat: add outputs status and command

palazzem · Dec 1, 2023 · da7bbfc · da7bbfc
1 parent f10312e
commit da7bbfc
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/custom_components/econnect_metronet/const.py b/custom_components/econnect_metronet/const.py
@@ -14,6 +14,12 @@
 CONF_AREAS_ARM_VACATION = "areas_arm_vacation"
 CONF_SCAN_INTERVAL = "scan_interval"
 DOMAIN = "econnect_metronet"
+NOTIFICATION_MESSAGE = (
+    "The switch cannot be used because it is not properly configured in the alarm control panel. "
+    "Please contact your installer to enable it."
+)
+NOTIFICATION_TITLE = "Unable to toggle the switch"
+NOTIFICATION_IDENTIFIER = "econnect_metronet_output_fail"
 KEY_DEVICE = "device"
 KEY_COORDINATOR = "coordinator"
 KEY_UNSUBSCRIBER = "options_unsubscriber"

diff --git a/custom_components/econnect_metronet/devices.py b/custom_components/econnect_metronet/devices.py
@@ -345,9 +345,11 @@ def turn_off(self, output):
             try:
                 element_id = item.get("element")
                 self._connection.turn_off(element_id)
+                return True
             except HTTPError as err:
                 _LOGGER.error(f"Device | Error while turning off output: {err.response.text}")
                 raise err
+        return False
 
     def turn_on(self, output):
         """
@@ -390,6 +392,8 @@ def turn_on(self, output):
             try:
                 element_id = item.get("element")
                 self._connection.turn_on(element_id)
+                return True
             except HTTPError as err:
                 _LOGGER.error(f"Device | Error while turning on outputs: {err.response.text}")
                 raise err
+        return False
diff --git a/custom_components/econnect_metronet/switch.py b/custom_components/econnect_metronet/switch.py
@@ -1,4 +1,5 @@
 from elmo import query as q
+from homeassistant.components import persistent_notification
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
@@ -14,6 +15,9 @@
     DOMAIN,
     KEY_COORDINATOR,
     KEY_DEVICE,
+    NOTIFICATION_IDENTIFIER,
+    NOTIFICATION_MESSAGE,
+    NOTIFICATION_TITLE,
 )
 from .devices import AlarmDevice
 from .helpers import generate_entity_id
@@ -84,8 +88,16 @@ def is_on(self) -> bool:
 
     async def async_turn_off(self):
         """Turn the entity off."""
-        await self.hass.async_add_executor_job(self._device.turn_off, self._output_id)  # pragma: no cover
+        # await self.hass.async_add_executor_job(self._device.turn_off, self._output_id)  # pragma: no cover
+        if not await self.hass.async_add_executor_job(self._device.turn_off, self._output_id):
+            persistent_notification.async_create(
+                self.hass, NOTIFICATION_MESSAGE, NOTIFICATION_TITLE, NOTIFICATION_IDENTIFIER
+            )
 
     async def async_turn_on(self):
         """Turn the entity off."""
-        await self.hass.async_add_executor_job(self._device.turn_on, self._output_id)  # pragma: no cover
+        # await self.hass.async_add_executor_job(self._device.turn_on, self._output_id)  # pragma: no cover
+        if not await self.hass.async_add_executor_job(self._device.turn_on, self._output_id):
+            persistent_notification.async_create(
+                self.hass, NOTIFICATION_MESSAGE, NOTIFICATION_TITLE, NOTIFICATION_IDENTIFIER
+            )