Merge pull request #2143 from vinceg0267/sofar-eps-feedin-cleanup

Sofar: Unlock EPS for Monophase (X1) and clean FeedIn selection

Author: wills106

custom_components/solax_modbus/plugin_sofar.py

@@ -464,7 +464,7 @@ def value_function_sync_rtc_ymd_sofar(initval: Any, descr: Any, datadict: dict[s
         native_min_value=0,
         native_max_value=21600,
         native_step=1,
-        allowedtypes=HYBRID | X3 | EPS,
+        allowedtypes=HYBRID | EPS,
         prevent_update=True,
         write_method=WRITE_DATA_LOCAL,
         entity_registry_enabled_default=False,
@@ -580,7 +580,19 @@ def value_function_sync_rtc_ymd_sofar(initval: Any, descr: Any, datadict: dict[s
             1: "Enabled - Feed-in limitation",
             2: "Enabled - 3-phase limit",
         },
-        allowedtypes=HYBRID | PV,
+        allowedtypes=HYBRID | PV | X3,
+        write_method=WRITE_DATA_LOCAL,
+        icon="mdi:transmission-tower-import",
+    ),
+    SofarModbusSelectEntityDescription(
+        name="FeedIn: Limitation Mode",
+        key="feedin_limitation_mode",
+        register_data_type=REGISTER_U16,
+        option_dict={
+            0: "Disabled",
+            1: "Enabled - Feed-in limitation",
+        },
+        allowedtypes=HYBRID | PV | X1,
         write_method=WRITE_DATA_LOCAL,
         icon="mdi:transmission-tower-import",
     ),
@@ -720,7 +732,7 @@ def value_function_sync_rtc_ymd_sofar(initval: Any, descr: Any, datadict: dict[s
             1: "Turn On, Prohibit Cold Start",
             2: "Turn On, Enable Cold Start",
         },
-        allowedtypes=HYBRID | X3 | EPS,
+        allowedtypes=HYBRID | EPS,
         icon="mdi:power-plug-off",
     ),
     # Does not work. 0x1035, 0x1036, and 0x1037 have to be written in one single chunk
@@ -771,7 +783,23 @@ def value_function_sync_rtc_ymd_sofar(initval: Any, descr: Any, datadict: dict[s
             6: "Generator mode",
             7: "Feed-In Priority Mode",
         },
-        allowedtypes=HYBRID,
+        allowedtypes=HYBRID | X3,
+        write_method=WRITE_MULTISINGLE_MODBUS,
+        icon="mdi:battery-charging-60",
+    ),
+    SofarModbusSelectEntityDescription(
+        name="Energy Storage Mode",
+        key="charger_use_mode",
+        register=0x1110,
+        option_dict={
+            0: "Self Use",
+            1: "Time of Use",
+            2: "Timing Mode",
+            3: "Passive Mode",
+            4: "Peak Cut Mode",
+            5: "Off-grid Mode",
+        },
+        allowedtypes=HYBRID | X1,
         write_method=WRITE_MULTISINGLE_MODBUS,
         icon="mdi:battery-charging-60",
     ),
@@ -3314,15 +3342,15 @@ def value_function_sync_rtc_ymd_sofar(initval: Any, descr: Any, datadict: dict[s
             2: "Turn On, Enable Cold Start",
         },
         entity_registry_enabled_default=False,
-        allowedtypes=HYBRID | X3 | EPS,
+        allowedtypes=HYBRID | EPS,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
     SofarModbusSensorEntityDescription(
         name="EPS Wait Time",
         key="passive_eps_wait_time",
         register=0x102A,
         entity_registry_enabled_default=False,
-        allowedtypes=HYBRID | X3 | EPS,
+        allowedtypes=HYBRID | EPS,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
     SofarModbusSensorEntityDescription(