SolaX: align entity names with the cloud app

Display names of the hybrid battery-mode settings now match what the SolaX
cloud app shows, so a setting is called the same thing in both places.
Keys and entity ids are unchanged.

  Selfuse Night Charge           -> Self Use Charge from Grid
  Selfuse Discharge Min SOC      -> Self Use Min SoC
  Selfuse Nightcharge Upper SOC  -> Self Use Charge Battery to
  Feedin Discharge Min SOC       -> Feed-In Priority Min SoC
  Feedin Nightcharge Upper SOC   -> Feed-In Priority Charge Battery to
  Backup Discharge Min SOC       -> Backup Min SoC
  Backup Nightcharge Upper SOC   -> Backup Charge Battery to
  Charge Start 1 / Charge End 1  -> Force Charge Start / Force Charge End
  Discharge Start 1 / End 1      -> Allowed Discharge Start / End

"Feedin Priority" becomes "Feed-In Priority" everywhere, including the
remote control power control options, since it is a mode name in the app.

Self Use Charge Battery to only applies while Self Use night charge is
enabled, so it uses active_when to follow that switch.

Author: Bl00d-B0b

custom_components/solax_modbus/plugin_solax.py

@@ -448,7 +448,7 @@ def autorepeat_function_remotecontrol_recompute(initval: int, descr: Any, datadi
         ap_target = target - pv_power  # + house_load ... already accounted for by the inverter
         power_control = "Enabled Power Control"
 
-    elif power_control == "Enabled Feedin Priority":
+    elif power_control == "Enabled Feed-In Priority":
         # Maximize grid export by using excess PV and battery
         if pv_power > house_load:
             # If more power than house load, try to export all excess
@@ -888,7 +888,7 @@ def autorepeat_function_powercontrolmode8_recompute(initval: int, descr: Any, da
             f"[Mode8 Negative Injection and Consumption Price] charge: available={available}W within_bms={max_charge}W "
             f"bms_cap≈{bms_cap_w}W pct_cap={pct_cap_w}W -> charge={desired_charge}W"
         )
-    elif power_control == "Enabled Feedin Priority":
+    elif power_control == "Enabled Feed-In Priority":
         pvlimit = setpvlimit
         pushmode_power = max(houseload - pv, 0.0)
     elif power_control == "Enabled No Discharge":
@@ -2038,7 +2038,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
     #
     ###
     SolaxModbusNumberEntityDescription(
-        name="Backup Discharge Min SOC",
+        name="Backup Min SoC",
         key="backup_discharge_min_soc",
         register=0x67,
         fmt="i",
@@ -2050,7 +2050,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         icon="mdi:battery-charging-low",
     ),
     SolaxModbusNumberEntityDescription(
-        name="Backup Nightcharge Upper SOC",
+        name="Backup Charge Battery to",
         key="backup_nightcharge_upper_soc",
         register=0x66,
         fmt="i",
@@ -2274,7 +2274,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         icon="mdi:battery-charging-low",
     ),
     SolaxModbusNumberEntityDescription(
-        name="Feedin Nightcharge Upper SOC",
+        name="Feed-In Priority Charge Battery to",
         key="feedin_nightcharge_upper_soc",
         register=0x64,
         fmt="i",
@@ -2430,7 +2430,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         icon="mdi:battery-sync",
     ),
     SolaxModbusNumberEntityDescription(
-        name="Selfuse Discharge Min SOC",
+        name="Self Use Min SoC",
         key="selfuse_discharge_min_soc",
         register=0x61,
         fmt="i",
@@ -2442,9 +2442,10 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         icon="mdi:battery-charging-low",
     ),
     SolaxModbusNumberEntityDescription(
-        name="Selfuse Nightcharge Upper SOC",
+        name="Self Use Charge Battery to",
         key="selfuse_nightcharge_upper_soc",
         register=0x63,
+        active_when={"selfuse_night_charge_enable": (1,)},
         fmt="i",
         native_min_value=10,
         native_max_value=100,
@@ -3286,7 +3287,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         icon="mdi:dip-switch",
     ),
     SolaXModbusSwitchEntityDescription(
-        name="Selfuse Night Charge",
+        name="Self Use Charge from Grid",
         key="selfuse_night_charge_enable",
         register=0x62,
         sensor_key="selfuse_night_charge_enable",
@@ -3315,7 +3316,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
             11: "Enabled Grid Control",  # computed variation of Power Control, grid import level in absence of PV
             12: "Enabled Battery Control",  # computed variation of Power Control, battery import without of PV
             110: "Enabled Self Use",  # variation of Grid Control with fixed target 0
-            120: "Enabled Feedin Priority",  # variation of Battery Control with fixed target 0
+            120: "Enabled Feed-In Priority",  # variation of Battery Control with fixed target 0
             130: "Enabled No Discharge",  # missing HL from grid
             # 2: "Enabled Quantity Control",
             # 3: "Enabled SOC Target Control",
@@ -3350,7 +3351,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
             83: "Export-First Battery Limit",
             84: "Enabled Grid Control",
             85: "Enabled No Discharge",
-            86: "Enabled Feedin Priority",
+            86: "Enabled Feed-In Priority",
             # 9:  "Mode 9 - PV and BAT control - Target SOC",
         },
         allowedtypes=AC | HYBRID | GEN4 | GEN5 | GEN6,
@@ -3445,7 +3446,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
             0: "Self Use Mode",
             1: "Force Time Use",
             2: "Back Up Mode",
-            3: "Feedin Priority",
+            3: "Feed-In Priority",
         },
         allowedtypes=AC | HYBRID | GEN3,
         icon="mdi:dip-switch",
@@ -3456,7 +3457,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         register=0x1F,
         option_dict={
             0: "Self Use Mode",
-            1: "Feedin Priority",
+            1: "Feed-In Priority",
             2: "Back Up Mode",
             3: "Manual Mode",
             4: "PeakShaving",
@@ -4060,7 +4061,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
             0: "Self Use Mode",
             1: "Force Time Use",
             2: "Back Up Mode",
-            3: "Feedin Priority",
+            3: "Feed-In Priority",
         },
         allowedtypes=AC | HYBRID | GEN2 | GEN3,
         internal=True,
@@ -4070,7 +4071,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         register=0x8B,
         scale={
             0: "Self Use Mode",
-            1: "Feedin Priority",
+            1: "Feed-In Priority",
             2: "Back Up Mode",
             3: "Manual Mode",
             4: "PeakShaving",
@@ -11025,7 +11026,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
 
 TIME_TYPES = [
     SolaXModbusTimeEntityDescription(
-        name="Charge Start 1",
+        name="Force Charge Start",
         key="charge_start_1",
         register=0x26,
         option_dict=TIME_OPTIONS,
@@ -11034,7 +11035,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         icon="mdi:clock-start",
     ),
     SolaXModbusTimeEntityDescription(
-        name="Charge End 1",
+        name="Force Charge End",
         key="charge_end_1",
         register=0x27,
         option_dict=TIME_OPTIONS,
@@ -11043,7 +11044,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         icon="mdi:clock-end",
     ),
     SolaXModbusTimeEntityDescription(
-        name="Charge Start 2",
+        name="Force Charge Start 2",
         key="charge_start_2",
         register=0x2A,
         option_dict=TIME_OPTIONS,
@@ -11052,7 +11053,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         icon="mdi:clock-start",
     ),
     SolaXModbusTimeEntityDescription(
-        name="Charge End 2",
+        name="Force Charge End 2",
         key="charge_end_2",
         register=0x2B,
         option_dict=TIME_OPTIONS,
@@ -11083,7 +11084,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         icon="mdi:clock-start",
     ),
     SolaXModbusTimeEntityDescription(
-        name="Discharge Start 1",
+        name="Allowed Discharge Start",
         key="discharge_start_1",
         register=0x28,
         option_dict=TIME_OPTIONS,
@@ -11092,7 +11093,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         icon="mdi:clock-start",
     ),
     SolaXModbusTimeEntityDescription(
-        name="Discharge End 1",
+        name="Allowed Discharge End",
         key="discharge_end_1",
         register=0x29,
         option_dict=TIME_OPTIONS,
@@ -11101,7 +11102,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         icon="mdi:clock-end",
     ),
     SolaXModbusTimeEntityDescription(
-        name="Discharge Start 2",
+        name="Allowed Discharge Start 2",
         key="discharge_start_2",
         register=0x2C,
         option_dict=TIME_OPTIONS,
@@ -11110,7 +11111,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         icon="mdi:clock-start",
     ),
     SolaXModbusTimeEntityDescription(
-        name="Discharge End 2",
+        name="Allowed Discharge End 2",
         key="discharge_end_2",
         register=0x2D,
         option_dict=TIME_OPTIONS,
@@ -11119,7 +11120,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         icon="mdi:clock-end",
     ),
     SolaXModbusTimeEntityDescription(
-        name="Charge End 1",
+        name="Force Charge End",
         key="charge_end_1",
         register=0x69,
         option_dict=TIME_OPTIONS_GEN4,
@@ -11128,7 +11129,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         icon="mdi:clock-end",
     ),
     SolaXModbusTimeEntityDescription(
-        name="Charge End 2",
+        name="Force Charge End 2",
         key="charge_end_2",
         register=0x6E,
         option_dict=TIME_OPTIONS_GEN4,
@@ -11137,7 +11138,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         icon="mdi:clock-end",
     ),
     SolaXModbusTimeEntityDescription(
-        name="Charge Start 1",
+        name="Force Charge Start",
         key="charge_start_1",
         register=0x68,
         option_dict=TIME_OPTIONS_GEN4,
@@ -11146,7 +11147,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         icon="mdi:clock-start",
     ),
     SolaXModbusTimeEntityDescription(
-        name="Charge Start 2",
+        name="Force Charge Start 2",
         key="charge_start_2",
         register=0x6D,
         option_dict=TIME_OPTIONS_GEN4,
@@ -11155,7 +11156,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         icon="mdi:clock-start",
     ),
     SolaXModbusTimeEntityDescription(
-        name="Discharge End 1",
+        name="Allowed Discharge End",
         key="discharge_end_1",
         register=0x6B,
         option_dict=TIME_OPTIONS_GEN4,
@@ -11164,7 +11165,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         icon="mdi:clock-end",
     ),
     SolaXModbusTimeEntityDescription(
-        name="Discharge End 2",
+        name="Allowed Discharge End 2",
         key="discharge_end_2",
         register=0x70,
         option_dict=TIME_OPTIONS_GEN4,
@@ -11173,7 +11174,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         icon="mdi:clock-end",
     ),
     SolaXModbusTimeEntityDescription(
-        name="Discharge Start 1",
+        name="Allowed Discharge Start",
         key="discharge_start_1",
         register=0x6A,
         option_dict=TIME_OPTIONS_GEN4,
@@ -11182,7 +11183,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         icon="mdi:clock-start",
     ),
     SolaXModbusTimeEntityDescription(
-        name="Discharge Start 2",
+        name="Allowed Discharge Start 2",
         key="discharge_start_2",
         register=0x6F,
         option_dict=TIME_OPTIONS_GEN4,