correct sensor creation

Author: msp1974

custom_components/apsystems_ecu_proxy/sensor.py

@@ -14,7 +14,6 @@
     SensorStateClass,
 )
 from homeassistant.config_entries import ConfigEntry
-
 from homeassistant.const import (
     ATTR_UNIT_OF_MEASUREMENT,
     UnitOfElectricCurrent,
@@ -32,7 +31,6 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util import dt as dt_util
 
-
 from .const import (
     ATTR_SUMMATION_FACTOR,
     ATTR_SUMMATION_PERIOD,
@@ -323,7 +321,7 @@ def handle_ecu_registration(data: dict[str, Any]):
                     data=data.get(sensor.parameter), attributes=initial_attribute_values
                 ),
             )
-            sensors.append(APSystemsSensor(sensor, config))
+            sensors.append(APSystemsSensor(sensor, config, config_entry))
         add_entities(sensors)
 
     @callback
@@ -367,7 +365,7 @@ def handle_inverter_registration(data: dict[str, Any]):
                     data=data.get(sensor.parameter), attributes=initial_attribute_values
                 ),
             )
-            sensors.append(APSystemsSensor(sensor, config))
+            sensors.append(APSystemsSensor(sensor, config, config_entry))
 
         # Add Inverter channel sensors
         for channel in range(data.get("channel_qty", 0)):
@@ -388,7 +386,7 @@ def handle_inverter_registration(data: dict[str, Any]):
                     ),
                     name=f"{sensor.name} Ch {channel + 1}",
                 )
-                sensors.append(APSystemsSensor(sensor, config))
+                sensors.append(APSystemsSensor(sensor, config, config_entry))
 
         add_entities(sensors)
 
@@ -419,10 +417,10 @@ class APSystemsSensor(RestoreSensor, SensorEntity):
     _attr_extra_state_attributes = {}
 
     def __init__(
-        self, 
-        definition: APSystemSensorDefinition, 
+        self,
+        definition: APSystemSensorDefinition,
         config: APSystemSensorConfig,
-        config_entry: ConfigEntry  # Accept ConfigEntry to get dynamic config values
+        config_entry: ConfigEntry,  # Accept ConfigEntry to get dynamic config values
     ) -> None:
         """Initialise sensor."""
         self._definition = definition
@@ -437,6 +435,8 @@ def __init__(
         self._attr_state_class = definition.state_class
         self._attr_unique_id = self._config.unique_id
 
+        self.max_stub_interval = int(self.config_entry.data.get("max_stub_interval"))
+
     @property
     def is_summation_sensor(self) -> bool:
         """Is this a summation sensor."""
@@ -646,8 +646,8 @@ def summation_calculation(
         current_value: float,
         value: float,
     ) -> int | float:
-
         """Return summation value of value over time.
+
         If change in period, calculates a value over time from start of new period with
         max of MAX_STUB_INTERVAL.
         If no change in period, assumes value persisted since last timestamp.
@@ -669,12 +669,9 @@ def summation_calculation(
 
         sum_value = None
         has_changed = False
-        
+
         # Get configuration. If initial data else options.
-        self.max_stub_interval = int(
-            self.config_entry.options.get('max_stub_interval', 
-            self.config_entry.data.get('max_stub_interval'))
-        )
+
         _LOGGER.debug("Max stub interval = %s", self.max_stub_interval)
 
         # Has it crossed calculation period boundry?