Merge pull request #2077 from TCWORLD/reinstate-total-regs

Reinstate PV Total Register for newer GEN6 (protocol≥100)

Author: wills106

custom_components/solax_modbus/plugin_solax.py

@@ -7088,11 +7088,9 @@ def value_function_battery_voltage_cell_difference(initval: int, descr: Any, dat
         allowedtypes=HYBRID | GEN6 | MPPT4,
         icon="mdi:solar-power-variant",
     ),
-    # V001.00 system-info register. Keep the existing calculated pv_power_total
-    # as the primary entity because this register returns 0 on some tested units.
     SolaXModbusSensorEntityDescription(
-        name="System PV Power Total",
-        key="system_pv_power_total",
+        name="PV Power Total",
+        key="pv_power_total",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
@@ -7130,6 +7128,9 @@ def value_function_battery_voltage_cell_difference(initval: int, descr: Any, dat
         modbus_min=100,
         icon="mdi:home-lightning-bolt",
     ),
+    # "Total Battery Power Charge" excludes GEN4 intentionally as the name
+    # conflicts with existing entity for register 0x16. As GEN4 is single
+    # battery this is not an issue.
     SolaXModbusSensorEntityDescription(
         name="Total Battery Power Charge",
         key="battery_power_charge",
@@ -7139,7 +7140,8 @@ def value_function_battery_voltage_cell_difference(initval: int, descr: Any, dat
         register=0x38,
         register_type=REG_INPUT,
         register_data_type=REGISTER_S32,
-        allowedtypes=AC | HYBRID | GEN6,
+        modbus_min=100,
+        allowedtypes=AC | HYBRID | GEN5 | GEN6,
         icon="mdi:battery-charging",
     ),
     SolaXModbusSensorEntityDescription(
@@ -9671,7 +9673,7 @@ def value_function_battery_voltage_cell_difference(initval: int, descr: Any, dat
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
-        allowedtypes=HYBRID,
+        allowedtypes=HYBRID | GEN | GEN2 | GEN3,
         blacklist=["PRI"],  # X1-FIT has no DC PV input
         depends_on=[
             "pv_power_1",
@@ -9683,6 +9685,25 @@ def value_function_battery_voltage_cell_difference(initval: int, descr: Any, dat
         ],
         icon="mdi:solar-power-variant",
     ),
+    SolaXModbusSensorEntityDescription(
+        name="PV Power Total",
+        key="pv_power_total",
+        value_function=value_function_pv_power_total,
+        native_unit_of_measurement=UnitOfPower.WATT,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+        modbus_max=99,
+        allowedtypes=HYBRID | GEN4 | GEN5 | GEN6,
+        depends_on=[
+            "pv_power_1",
+            "pv_power_2",
+            "pv_power_3",
+            "pv_power_4",
+            "pv_power_5",
+            "pv_power_6",
+        ],
+        icon="mdi:solar-power-variant",
+    ),
     SolaXModbusSensorEntityDescription(
         name="House Load Alt",
         key="house_load_alt",
@@ -9758,8 +9779,9 @@ def value_function_battery_voltage_cell_difference(initval: int, descr: Any, dat
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
+        modbus_max=99,
         value_function=value_function_battery_power_charge,
-        allowedtypes=AC | HYBRID | GEN5,
+        allowedtypes=AC | HYBRID | GEN5 | GEN6,
         icon="mdi:battery-charging",
     ),
     #####