Update PV power calculation and version bump to 1.0.10

Author: TypQxQ

custom_components/sigen/binary_sensor.py

@@ -21,6 +21,7 @@
 from .coordinator import SigenergyDataUpdateCoordinator
 from .sigen_entity import SigenergyEntity
 from .common import generate_sigen_entity
+from .calculated_sensor import SigenergyCalculations
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -42,9 +43,16 @@ class SigenergyBinarySensorEntityDescription(
         name="PV Generating",
         device_class=BinarySensorDeviceClass.POWER,
         icon="mdi:solar-power",
-        source_key="plant_photovoltaic_power",
-        value_fn=lambda data: (val := data.get("plant_photovoltaic_power")) \
-            is not None and Decimal(str(val)) > Decimal("0.01"),
+        source_key=None,  # No longer a direct key, calculated from multiple values
+        value_fn=lambda data: (
+            (
+                power := SigenergyCalculations.calculate_total_pv_power(
+                    None, coordinator_data={"plant": data}
+                )
+            )
+            is not None
+            and power > 0.01
+        ),
     ),
     SigenergyBinarySensorEntityDescription(
         key="plant_battery_charging",
@@ -161,11 +169,17 @@ def is_on(self) -> bool | None:
 
         plant_data = self.coordinator.data["plant"]
 
-        # Check if the source key exists in the plant data
-        if self.entity_description.source_key not in plant_data:
-            _LOGGER.debug("[%s] Source key '%s' not found in plant data",
-                           self.entity_id, self.entity_description.source_key)
-            return None # Source data missing
+        # If a source key is defined, check if it exists in the plant data
+        if (
+            self.entity_description.source_key is not None
+            and self.entity_description.source_key not in plant_data
+        ):
+            _LOGGER.debug(
+                "[%s] Source key '%s' not found in plant data",
+                self.entity_id,
+                self.entity_description.source_key,
+            )
+            return None  # Source data missing
 
         # Check if value_fn is defined
         if self.entity_description.value_fn is None:

custom_components/sigen/calculated_sensor.py

@@ -139,7 +139,7 @@ def calculate_total_pv_power(
         plant_data = coordinator_data.get("plant", {})
 
         plant_pv_power = safe_float(
-            plant_data.get("plant_photovoltaic_power"))
+            plant_data.get("plant_sigen_photovoltaic_power"))
         thirdparty_pv_power = safe_float(
             plant_data.get("plant_third_party_photovoltaic_power"))
 
@@ -149,7 +149,7 @@ def calculate_total_pv_power(
             _LOGGER.debug("[CS][Total PV Power] Both plant_photovoltaic_power and thirdparty_pv_power are unavailable.")
             return None
 
-        return (plant_pv_power or 0.0) + (thirdparty_pv_power or 0.0)
+        return safe_float((plant_pv_power or 0.0) + (thirdparty_pv_power or 0.0))
 
     @staticmethod
     def calculate_pv_power(
@@ -327,10 +327,11 @@ def calculate_plant_consumed_power(
         # Get the required values from coordinator data
         plant_data = coordinator_data["plant"]
 
-        # Get PV power
-        pv_power = plant_data.get("plant_photovoltaic_power")
+        # Use the correct calculation for total PV power
+        pv_power = SigenergyCalculations.calculate_total_pv_power(
+            None, coordinator_data=coordinator_data
+        )
 
-        # Get grid active power and calculate import/export
         grid_power = plant_data.get("plant_grid_sensor_active_power")
 
         # Get battery power
@@ -342,6 +343,11 @@ def calculate_plant_consumed_power(
 
         # Validate input types
         if not isinstance(pv_power, (int, float)):
+            _LOGGER.warning(
+                "[CS][Plant Consumed] PV power is not a number: %s (type: %s)",
+                pv_power,
+                type(pv_power).__name__,
+            )
             return None
         if not isinstance(grid_power, (int, float)):
             _LOGGER.warning(

custom_components/sigen/manifest.json

@@ -21,5 +21,5 @@
   "loggers": ["custom_components.sigen"],
   "quality_scale": "custom",
   "requirements": ["pymodbus>=3.0.0"],
-  "version": "1.0.8"
+  "version": "1.0.10"
 }