Add channel accessibility check

custom_components/smaev/__init__.py

@@ -25,9 +25,12 @@
 
 from .const import (
     DOMAIN,
+    SMAEV_CHANNELS,
     SMAEV_COORDINATOR,
     SMAEV_DEVICE_INFO,
+    SMAEV_MEASUREMENT,
     SMAEV_OBJECT,
+    SMAEV_PARAMETER,
 )
 from .coordinator import SmaEvChargerCoordinator
 from .services import async_setup_services, async_unload_services
@@ -79,12 +82,19 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         sw_version=smaev_device_info["sw_version"],
     )
 
+    measurement_channels = await evcharger.get_measurement_channels()
+    parameter_channels = await evcharger.get_parameter_channels()
+
     coordinator = SmaEvChargerCoordinator(hass, entry, evcharger)
 
     hass.data[DOMAIN][entry.entry_id] = {
         SMAEV_OBJECT: evcharger,
         SMAEV_DEVICE_INFO: device_info,
         SMAEV_COORDINATOR: coordinator,
+        SMAEV_CHANNELS: {
+            SMAEV_MEASUREMENT: measurement_channels,
+            SMAEV_PARAMETER: parameter_channels,
+        },
     }
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)

custom_components/smaev/const.py

@@ -1,6 +1,7 @@
 """Constants for the SMA EV Charger integration."""
 DOMAIN = "smaev"
 
+SMAEV_CHANNELS = "channels"
 SMAEV_COORDINATOR = "coordinator"
 SMAEV_OBJECT = "pysmaev"
 SMAEV_DEVICE_INFO = "device_info"

custom_components/smaev/datetime.py

@@ -25,6 +25,7 @@
 from . import generate_smaev_entity_id
 from .const import (
     DOMAIN,
+    SMAEV_CHANNELS,
     SMAEV_COORDINATOR,
     SMAEV_DEVICE_INFO,
     SMAEV_PARAMETER,
@@ -70,11 +71,17 @@ async def async_setup_entry(
     entities = []
 
     for entity_description in DATETIME_DESCRIPTIONS:
-        entities.append(
-            SmaEvChargerDateTime(
-                hass, coordinator, config_entry, device_info, entity_description
+        if entity_description.channel in data[SMAEV_CHANNELS][entity_description.type]:
+            entities.append(
+                SmaEvChargerDateTime(
+                    hass, coordinator, config_entry, device_info, entity_description
+                )
+            )
+        else:
+            _LOGGER.warning(
+                "Channel '%s' is not accessible. Elevated rights might be required.",
+                entity_description.channel,
             )
-        )
 
     async_add_entities(entities)
 

custom_components/smaev/number.py

@@ -5,7 +5,6 @@
 import logging
 from typing import TYPE_CHECKING
 
-from pysmaev.exceptions import SmaEvChargerChannelError
 from pysmaev.helpers import get_parameters_channel
 
 from homeassistant.components.number import (
@@ -33,6 +32,7 @@
 from . import generate_smaev_entity_id
 from .const import (
     DOMAIN,
+    SMAEV_CHANNELS,
     SMAEV_COORDINATOR,
     SMAEV_DEFAULT_MAX,
     SMAEV_DEFAULT_MIN,
@@ -125,11 +125,17 @@ async def async_setup_entry(
 
     entities = []
     for entity_description in NUMBER_DESCRIPTIONS:
-        entities.append(
-            SmaEvChargerNumber(
-                hass, coordinator, config_entry, device_info, entity_description
+        if entity_description.channel in data[SMAEV_CHANNELS][entity_description.type]:
+            entities.append(
+                SmaEvChargerNumber(
+                    hass, coordinator, config_entry, device_info, entity_description
+                )
+            )
+        else:
+            _LOGGER.warning(
+                "Channel '%s' is not accessible. Elevated rights might be required.",
+                entity_description.channel,
             )
-        )
 
     async_add_entities(entities)
 
@@ -165,13 +171,10 @@ def __init__(
     @callback
     def _handle_coordinator_update(self) -> None:
         """Handle updated data from the coordinator."""
-        try:
-            channel = get_parameters_channel(
-                self.coordinator.data[SMAEV_PARAMETER],
-                self.entity_description.channel,
-            )
-        except SmaEvChargerChannelError:
-            return
+        channel = get_parameters_channel(
+            self.coordinator.data[SMAEV_PARAMETER],
+            self.entity_description.channel,
+        )
 
         min_value = channel.get(SMAEV_MIN_VALUE)
         max_value = channel.get(SMAEV_MAX_VALUE)

custom_components/smaev/select.py

@@ -6,7 +6,6 @@
 from typing import TYPE_CHECKING
 
 from pysmaev.const import SmaEvChargerParameters
-from pysmaev.exceptions import SmaEvChargerChannelError
 from pysmaev.helpers import get_parameters_channel
 
 from homeassistant.components.select import (
@@ -27,6 +26,7 @@
 from . import generate_smaev_entity_id
 from .const import (
     DOMAIN,
+    SMAEV_CHANNELS,
     SMAEV_COORDINATOR,
     SMAEV_DEVICE_INFO,
     SMAEV_PARAMETER,
@@ -93,11 +93,17 @@ async def async_setup_entry(
     entities = []
 
     for entity_description in SELECT_DESCRIPTIONS:
-        entities.append(
-            SmaEvChargerSelect(
-                hass, coordinator, config_entry, device_info, entity_description
+        if entity_description.channel in data[SMAEV_CHANNELS][entity_description.type]:
+            entities.append(
+                SmaEvChargerSelect(
+                    hass, coordinator, config_entry, device_info, entity_description
+                )
+            )
+        else:
+            _LOGGER.warning(
+                "Channel '%s' is not accessible. Elevated rights might be required.",
+                entity_description.channel,
             )
-        )
 
     async_add_entities(entities)
 
@@ -137,13 +143,10 @@ def __init__(
     @callback
     def _handle_coordinator_update(self) -> None:
         """Handle updated data from the coordinator."""
-        try:
-            channel = get_parameters_channel(
-                self.coordinator.data[SMAEV_PARAMETER],
-                self.entity_description.channel,
-            )
-        except SmaEvChargerChannelError:
-            return
+        channel = get_parameters_channel(
+            self.coordinator.data[SMAEV_PARAMETER],
+            self.entity_description.channel,
+        )
 
         possible_values = channel[SMAEV_POSSIBLE_VALUES]
         value = channel[SMAEV_VALUE]

custom_components/smaev/sensor.py

@@ -6,7 +6,6 @@
 from typing import TYPE_CHECKING
 
 from pysmaev.const import SmaEvChargerMeasurements
-from pysmaev.exceptions import SmaEvChargerChannelError
 from pysmaev.helpers import get_measurements_channel, get_parameters_channel
 
 from homeassistant.components.sensor import (
@@ -36,6 +35,7 @@
 from . import generate_smaev_entity_id
 from .const import (
     DOMAIN,
+    SMAEV_CHANNELS,
     SMAEV_COORDINATOR,
     SMAEV_DEVICE_INFO,
     SMAEV_MEASUREMENT,
@@ -216,11 +216,17 @@ async def async_setup_entry(
     entities = []
 
     for entity_description in SENSOR_DESCRIPTIONS:
-        entities.append(
-            SmaEvChargerSensor(
-                hass, coordinator, config_entry, device_info, entity_description
+        if entity_description.channel in data[SMAEV_CHANNELS][entity_description.type]:
+            entities.append(
+                SmaEvChargerSensor(
+                    hass, coordinator, config_entry, device_info, entity_description
+                )
+            )
+        else:
+            _LOGGER.warning(
+                "Channel '%s' is not accessible. Elevated rights might be required.",
+                entity_description.channel,
             )
-        )
 
     async_add_entities(entities)
 
@@ -253,21 +259,18 @@ def __init__(
     @callback
     def _handle_coordinator_update(self) -> None:
         """Handle updated data from the coordinator."""
-        try:
-            if self.entity_description.type == SMAEV_MEASUREMENT:
-                channel = get_measurements_channel(
-                    self.coordinator.data[SMAEV_MEASUREMENT],
-                    self.entity_description.channel,
-                )
-                value = channel[0][SMAEV_VALUE]
-            else:  # SMAEV_PARAMETER
-                channel = get_parameters_channel(
-                    self.coordinator.data[SMAEV_PARAMETER],
-                    self.entity_description.channel,
-                )
-                value = channel[SMAEV_VALUE]
-        except SmaEvChargerChannelError:
-            return
+        if self.entity_description.type == SMAEV_MEASUREMENT:
+            channel = get_measurements_channel(
+                self.coordinator.data[SMAEV_MEASUREMENT],
+                self.entity_description.channel,
+            )
+            value = channel[0][SMAEV_VALUE]
+        else:  # SMAEV_PARAMETER
+            channel = get_parameters_channel(
+                self.coordinator.data[SMAEV_PARAMETER],
+                self.entity_description.channel,
+            )
+            value = channel[SMAEV_VALUE]
 
         value = self.entity_description.value_mapping.get(value, value)
 

custom_components/smaev/switch.py

@@ -6,7 +6,6 @@
 from typing import TYPE_CHECKING, Any
 
 from pysmaev.const import SmaEvChargerParameters
-from pysmaev.exceptions import SmaEvChargerChannelError
 from pysmaev.helpers import get_parameters_channel
 
 from homeassistant.components.switch import (
@@ -27,6 +26,7 @@
 from . import generate_smaev_entity_id
 from .const import (
     DOMAIN,
+    SMAEV_CHANNELS,
     SMAEV_COORDINATOR,
     SMAEV_DEVICE_INFO,
     SMAEV_PARAMETER,
@@ -89,11 +89,17 @@ async def async_setup_entry(
     entities = []
 
     for entity_description in SWITCH_DESCRIPTIONS:
-        entities.append(
-            SmaEvChargerSwitch(
-                hass, coordinator, config_entry, device_info, entity_description
+        if entity_description.channel in data[SMAEV_CHANNELS][entity_description.type]:
+            entities.append(
+                SmaEvChargerSwitch(
+                    hass, coordinator, config_entry, device_info, entity_description
+                )
+            )
+        else:
+            _LOGGER.warning(
+                "Channel '%s' is not accessible. Elevated rights might be required.",
+                entity_description.channel,
             )
-        )
 
     async_add_entities(entities)
 
@@ -131,13 +137,10 @@ def __init__(
     @callback
     def _handle_coordinator_update(self) -> None:
         """Handle updated data from the coordinator."""
-        try:
-            channel = get_parameters_channel(
-                self.coordinator.data[SMAEV_PARAMETER],
-                self.entity_description.channel,
-            )
-        except SmaEvChargerChannelError:
-            return
+        channel = get_parameters_channel(
+            self.coordinator.data[SMAEV_PARAMETER],
+            self.entity_description.channel,
+        )
 
         value = channel[SMAEV_VALUE]
         self._attr_is_on = self.entity_description.value_mapping.get(value, value)