Merge pull request #2071 from TCWORLD/missing-solax-eps-regs

Additional Hybrid EPS Entities

Author: wills106

custom_components/solax_modbus/plugin_solax.py

@@ -2101,6 +2101,30 @@ def value_function_battery_voltage_cell_difference(initval: int, descr: Any, dat
         max_exceptions=MAX_EXPORT,
         icon="mdi:home-export-outline",
     ),
+    SolaxModbusNumberEntityDescription(
+        name="EPS Min SOC",
+        key="eps_min_soc",
+        register=0x44,
+        fmt="i",
+        native_min_value=10,
+        native_max_value=25,
+        native_step=1,
+        native_unit_of_measurement=PERCENTAGE,
+        allowedtypes=AC | HYBRID | GEN4 | GEN5 | GEN6 | EPS,
+        icon="mdi:battery-charging-low",
+    ),
+    SolaxModbusNumberEntityDescription(
+        name="EPS Restart SOC",
+        key="eps_restart_soc",
+        register=0x8E,
+        fmt="i",
+        native_min_value=15,
+        native_max_value=100,
+        native_step=1,
+        native_unit_of_measurement=PERCENTAGE,
+        allowedtypes=AC | HYBRID | GEN4 | GEN5 | GEN6 | EPS,
+        icon="mdi:battery-charging-medium",
+    ),
     SolaxModbusNumberEntityDescription(
         name="Generator Max Charge",
         key="generator_max_charge",
@@ -4573,6 +4597,14 @@ def value_function_battery_voltage_cell_difference(initval: int, descr: Any, dat
         allowedtypes=HYBRID | GEN2,
         internal=True,
     ),
+    SolaXModbusSensorEntityDescription(
+        name="EPS Restart SOC",
+        key="eps_restart_soc",
+        native_unit_of_measurement=PERCENTAGE,
+        register=0xA0,
+        allowedtypes=HYBRID | GEN4 | GEN5 | GEN6 | EPS,
+        internal=True,
+    ),
     SolaXModbusSensorEntityDescription(
         key="hotstandby",
         register=0xA1,
@@ -4761,6 +4793,14 @@ def value_function_battery_voltage_cell_difference(initval: int, descr: Any, dat
         },
         allowedtypes=AC | HYBRID | GEN2 | GEN3 | EPS,
     ),
+    SolaXModbusSensorEntityDescription(
+        name="EPS Min SOC",
+        key="eps_min_soc",
+        native_unit_of_measurement=PERCENTAGE,
+        register=0xB8,
+        internal=True,
+        allowedtypes=AC | HYBRID | GEN4 | GEN5 | GEN6 | EPS,
+    ),
     SolaXModbusSensorEntityDescription(
         name="EPS Set Frequency",
         key="eps_set_frequency",
@@ -4769,17 +4809,9 @@ def value_function_battery_voltage_cell_difference(initval: int, descr: Any, dat
             0: "50Hz",
             1: "60Hz",
         },
-        allowedtypes=AC | HYBRID | GEN4 | GEN5 | EPS,
-        modbus_min=102,
-    ),
-    SolaXModbusSensorEntityDescription(
-        name="EPS Min SOC",
-        key="eps_min_soc",
-        native_unit_of_measurement=PERCENTAGE,
-        register=0xB8,
         entity_registry_enabled_default=False,
-        allowedtypes=HYBRID | GEN4 | GEN5 | EPS,
-        modbus_min=102,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        allowedtypes=AC | HYBRID | GEN4 | GEN5 | GEN6 | EPS,
     ),
     SolaXModbusSensorEntityDescription(
         name="Inverter Rated Output Power",