Merge pull request #1475 from mpi/patch-1

Adjust total and daily sensors for GEN6 Solax inverters

Author: wills106

custom_components/solax_modbus/plugin_solax.py

@@ -4678,7 +4678,21 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
         scale=0.1,
         unit=REGISTER_U32,  # REGISTER_ULSB16MSB16,
         entity_registry_enabled_default=False,
-        allowedtypes=AC | HYBRID,
+        allowedtypes=AC | HYBRID | GEN2 | GEN3 | GEN4 | GEN5,
+    ),
+        SolaXModbusSensorEntityDescription(
+        name="Battery Output Energy Total",  # Need revisit these  
+        key="battery_output_energy_total",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL, #1300
+        icon="mdi:battery-arrow-down",
+        register=0x1D,
+        register_type=REG_INPUT,
+        scale=0.001,
+        unit=REGISTER_U32,  # REGISTER_ULSB16MSB16,
+        entity_registry_enabled_default=False,
+        allowedtypes=AC | HYBRID | GEN6,
     ),
     SolaXModbusSensorEntityDescription(
         name="Battery Input Energy Total",
@@ -4719,7 +4733,21 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
         scale=0.1,
         unit=REGISTER_U32,  # REGISTER_ULSB16MSB16,
         entity_registry_enabled_default=False,
-        allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | GEN6,
+        allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5,
+    ),
+    SolaXModbusSensorEntityDescription(
+        name="Battery Input Energy Total",
+        key="battery_input_energy_total",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL, #1300
+        icon="mdi:battery-arrow-up",
+        register=0x21,
+        register_type=REG_INPUT,
+        scale=0.001,
+        unit=REGISTER_U32,  # REGISTER_ULSB16MSB16,
+        entity_registry_enabled_default=False,
+        allowedtypes=AC | HYBRID | GEN6,
     ),
     SolaXModbusSensorEntityDescription(
         name="Battery Package Number",
@@ -4992,6 +5020,20 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
         unit=REGISTER_U32,
         allowedtypes=HYBRID | GEN3 | GEN4 | GEN5,
     ),
+    SolaXModbusSensorEntityDescription(
+        name="Total Yield",
+        key="total_yield",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        icon="mdi:solar-power",
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        register=0x52,
+        scale=0.001,
+        rounding=2,
+        register_type=REG_INPUT,
+        unit=REGISTER_U32,
+        allowedtypes=HYBRID | GEN6,
+    ),    
     SolaXModbusSensorEntityDescription(
         key="lock_state",
         register=0x54,
@@ -5468,6 +5510,20 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
         rounding=1,
         allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5,
     ),
+    SolaXModbusSensorEntityDescription(
+        name="Total Solar Energy",
+        key="total_solar_energy",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        icon="mdi:solar-power",
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        register=0x94,
+        register_type=REG_INPUT,
+        unit=REGISTER_U32,
+        scale=0.001,
+        rounding=1,
+        allowedtypes=AC | HYBRID | GEN6,
+    ),    
     SolaXModbusSensorEntityDescription(
         name="Today's Solar Energy",
         key="today_s_solar_energy",
@@ -5479,15 +5535,15 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
         register_type=REG_INPUT,
         scale=0.1,
         rounding=1,
-        allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5,
+        allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | GEN6,
     ),
     SolaXModbusSensorEntityDescription(
         name="Today's Export Energy",
         key="today_s_export_energy",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5,
+        allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | GEN6,
         register=0x98,
         register_type=REG_INPUT,
         unit=REGISTER_U32,
@@ -5506,7 +5562,7 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
         unit=REGISTER_U32,
         scale=0.01,
         rounding=2,
-        allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5,
+        allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | GEN6,
         icon="mdi:home-import-outline",
     ),
     SolaXModbusSensorEntityDescription(