Merge pull request #9 from HAEdwin/Replace-constants-by-dynamically-configurable-parameters

 Replace constants by dynamically configurable parameters

Author: HAEdwin

custom_components/apsystems_ecu_proxy/config_flow.py

@@ -28,7 +28,7 @@ async def async_step_user(self, user_input=None):
             vol.Required(KEYS[0], default="3.67.1.32"): str,
             vol.Required(KEYS[1], default="1800"): str,
             vol.Required(KEYS[2], default="300"): str,
-            vol.Required(KEYS[3], default="600"): str,
+            vol.Required(KEYS[3], default="660"): str,
             vol.Required(KEYS[4], default=True): bool,
         })
 

custom_components/apsystems_ecu_proxy/const.py

@@ -25,8 +25,6 @@
 
 # Datacom handling
 SOCKET_PORTS = [8995, 8996, 8997]
-# Max summation stub time to add for new period - see code in summation_calculation method in
-MAX_STUB_INTERVAL = 300
 
 # Config flow schema. These are also translated through associated json translations
 KEYS = [

custom_components/apsystems_ecu_proxy/manifest.json

@@ -14,5 +14,5 @@
     ],
     "requirements": [],
     "single_config_entry": true,
-    "version": "v1.0.0"
+    "version": "v1.1.0"
 }

custom_components/apsystems_ecu_proxy/sensor.py

@@ -14,6 +14,7 @@
     SensorStateClass,
 )
 from homeassistant.config_entries import ConfigEntry
+
 from homeassistant.const import (
     ATTR_UNIT_OF_MEASUREMENT,
     UnitOfElectricCurrent,
@@ -31,14 +32,14 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util import dt as dt_util
 
+
 from .const import (
     ATTR_SUMMATION_FACTOR,
     ATTR_SUMMATION_PERIOD,
     ATTR_SUMMATION_TYPE,
     ATTR_TIMESTAMP,
     ATTR_VALUE_IF_NO_UPDATE,
     DOMAIN,
-    MAX_STUB_INTERVAL,
     SOLAR_ICON,
     SummationPeriod,
     SummationType,
@@ -276,7 +277,7 @@ def restore_sensors():
                     ),
                 )
 
-                sensors.append(APSystemsSensor(definition, config))
+                sensors.append(APSystemsSensor(definition, config, config_entry))
 
         if sensors:
             add_entities(sensors)
@@ -418,11 +419,15 @@ class APSystemsSensor(RestoreSensor, SensorEntity):
     _attr_extra_state_attributes = {}
 
     def __init__(
-        self, definition: APSystemSensorDefinition, config: APSystemSensorConfig
+        self, 
+        definition: APSystemSensorDefinition, 
+        config: APSystemSensorConfig,
+        config_entry: ConfigEntry  # Accept ConfigEntry to get dynamic config values
     ) -> None:
         """Initialise sensor."""
         self._definition = definition
         self._config = config
+        self.config_entry = config_entry
 
         self._attr_device_class = definition.device_class
         self._attr_device_info = DeviceInfo(identifiers=self._config.device_identifier)
@@ -641,12 +646,13 @@ def summation_calculation(
         current_value: float,
         value: float,
     ) -> int | float:
-        """Return summation value of value over time.
 
+        """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.
         """
+
         _LOGGER.debug(
             "Summation values: Period: %s, Timestamp - current: %s, last: %s, Value - sensor: %s, current: %s",
             summation_period,
@@ -663,6 +669,13 @@ 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?
         if has_changed_period(summation_period, last_timestamp, current_timestamp):
@@ -683,7 +696,7 @@ def summation_calculation(
                             summation_period, current_timestamp
                         )
                     ).total_seconds(),
-                    MAX_STUB_INTERVAL,
+                    self.max_stub_interval,
                 )
                 sum_value = round(
                     int(value * (new_period_interval / 3600)) / summation_factor, 2

custom_components/apsystems_ecu_proxy/translations/en.json

@@ -6,7 +6,7 @@
           "ema_host": "EMA Host (3.67.1.32)",
           "message_ignore_age": "Message Ignore Age e.g. 1800 (seconds)",
           "max_stub_interval": "Max Stub Interval e.g. 300 (seconds)",
-          "no_update_timeout": "No Update Timeout e.g. 600 (seconds)",
+          "no_update_timeout": "No Update Timeout e.g. 660 (seconds)",
           "send_to_ema": "Send to EMA"
         },
         "title": "Configuration"
@@ -20,7 +20,7 @@
           "ema_host": "EMA Host (3.67.1.32)",
           "message_ignore_age": "Message Ignore Age e.g. 1800 (seconds)",
           "max_stub_interval": "Max Stub Interval e.g. 300 (seconds)",
-          "no_update_timeout": "No Update Timeout e.g. 600 (seconds) ",
+          "no_update_timeout": "No Update Timeout e.g. 660 (seconds) ",
           "send_to_ema": "Send to EMA"
         },
         "title": "Configuration"