feat: Add support for all three configurations H1, H2 and H3 of Pylontech Force

Signed-off-by: David Rapan <[email protected]>

Author: davidrapan

custom_components/solarman/__init__.py

@@ -99,7 +99,10 @@ async def async_migrate_entry(hass: HomeAssistant, config_entry: SolarmanConfigE
         bulk_safe_delete(new_data, OLD_)
         bulk_safe_delete(new_options, OLD_ | to_dict(CONF_BATTERY_NOMINAL_VOLTAGE, CONF_BATTERY_LIFE_CYCLE_RATING))
 
-        if not new_options.get(CONF_ADDITIONAL_OPTIONS):
+        if a := new_options.get(CONF_ADDITIONAL_OPTIONS):
+            if isinstance(m := a.get(CONF_MOD), bool):
+                m = int(m)
+        else:
             del new_options[CONF_ADDITIONAL_OPTIONS]
 
         hass.config_entries.async_update_entry(config_entry, unique_id = None, data = new_data, options = new_options, minor_version = ConfigFlowHandler.MINOR_VERSION, version = ConfigFlowHandler.VERSION)

custom_components/solarman/common.py

@@ -172,19 +172,21 @@ def strepr(value):
 
 def unwrap(source: dict, key: Any, mod: int = 0):
     if (c := source.get(key)) is not None and isinstance(c, list):
-        source[key] = c[mod]
+        source[key] = c[mod] if mod < len(c) else c[-1]
     return source
 
 def entity_key(object: dict):
     return slugify('_'.join(filter(None, (object["name"], object["platform"]))))
 
 def preprocess_descriptions(item, group, table, code, parameters):
     def modify(source: dict):
-        for i in source:
+        for i in dict(source):
             if i in ("scale", "min", "max"):
-                unwrap(source, i, parameters["mod"])
+                unwrap(source, i, parameters[CONF_MOD])
             if i == "registers" and source[i] and (isinstance(source[i], list) and isinstance(source[i][0], list)):
-                unwrap(source, i, parameters["mod"])
+                unwrap(source, i, parameters[CONF_MOD])
+                if not source[i]:
+                    source["disabled"] = True
             elif isinstance(source[i], dict):
                 modify(source[i])
 
@@ -209,7 +211,7 @@ def modify(source: dict):
     g = dict(group)
     g.pop("items")
     bulk_inherit(item, g, *() if "registers" in item else REQUEST_UPDATE_INTERVAL)
-    if not REQUEST_CODE in item and (r := item.get("registers")) is not None and (addr := min(r)) is not None:
+    if not REQUEST_CODE in item and (r := item.get("registers")) and (addr := min(r)) is not None:
         item[REQUEST_CODE] = table.get(addr, code)
     return item
 

custom_components/solarman/config_flow.py

@@ -38,7 +38,7 @@
     vol.Required(CONF_ADDITIONAL_OPTIONS): section(
         vol.Schema(
             {
-                vol.Optional(CONF_MOD, default = DEFAULT_[CONF_MOD], description = {SUGGESTED_VALUE: DEFAULT_[CONF_MOD]}): bool,
+                vol.Optional(CONF_MOD, default = DEFAULT_[CONF_MOD], description = {SUGGESTED_VALUE: DEFAULT_[CONF_MOD]}): vol.All(vol.Coerce(int), vol.Range(min = 0, max = 2)),
                 vol.Optional(CONF_MPPT, default = DEFAULT_[CONF_MPPT], description = {SUGGESTED_VALUE: DEFAULT_[CONF_MPPT]}): vol.All(vol.Coerce(int), vol.Range(min = 1, max = 12)),
                 vol.Optional(CONF_PHASE, default = DEFAULT_[CONF_PHASE], description = {SUGGESTED_VALUE: DEFAULT_[CONF_PHASE]}): vol.All(vol.Coerce(int), vol.Range(min = 1, max = 3)),
                 vol.Optional(CONF_PACK, default = DEFAULT_[CONF_PACK], description = {SUGGESTED_VALUE: DEFAULT_[CONF_PACK]}): vol.All(vol.Coerce(int), vol.Range(min = -1, max = 20)),
@@ -90,8 +90,8 @@ def remove_defaults(user_input: dict[str, Any]):
     return user_input
 
 class ConfigFlowHandler(ConfigFlow, domain = DOMAIN):
-    MINOR_VERSION = 9
-    VERSION = 1
+    MINOR_VERSION = 0
+    VERSION = 2
 
     async def async_step_dhcp(self, discovery_info: DhcpServiceInfo) -> ConfigFlowResult:
         _LOGGER.debug(f"ConfigFlowHandler.async_step_dhcp: {discovery_info}")

custom_components/solarman/const.py

@@ -47,7 +47,7 @@
     CONF_TRANSPORT: "tcp",
     CONF_MB_SLAVE_ID: 1,
     CONF_LOOKUP_FILE: "Auto",
-    CONF_MOD: False,
+    CONF_MOD: 0,
     CONF_MPPT: 4,
     CONF_PHASE: 3,
     CONF_PACK: -1,
@@ -77,7 +77,7 @@
 AUTODETECTION_BATTERY_REQUEST_DEYE = (AUTODETECTION_CODE_DEYE, *AUTODETECTION_BATTERY_REGISTERS_DEYE)
 AUTODETECTION_BATTERY_NUMBER_DEYE = (AUTODETECTION_CODE_DEYE, AUTODETECTION_BATTERY_REGISTERS_DEYE[0])
 
-PROFILE_REDIRECT = { "sofar_hyd3k-6k-es.yaml": "sofar_wifikit.yaml:mod=True", "hyd-zss-hp-3k-6k.yaml": "sofar_g3.yaml:pack=1", "solis_1p8k-5g.yaml": "solis_1p-5g.yaml", "solis_3p-4g+.yaml": "solis_3p-4g.yaml", "sofar_hyd-es.yaml": "sofar_wifikit.yaml:mod=True", "sofar_tlx-g3.yaml": "sofar_g3.yaml", "zcs_azzurro-1ph-tl-v3.yaml": "sofar_lsw3.yaml:mppt=1&l=1", "zcs_azzurro-hyd-zss-hp.yaml": "sofar_g3.yaml:pack=1", "zcs_azzurro-ktl-v3.yaml": "sofar_g3.yaml" }
+PROFILE_REDIRECT = { "sofar_hyd3k-6k-es.yaml": "sofar_wifikit.yaml:mod=1", "hyd-zss-hp-3k-6k.yaml": "sofar_g3.yaml:pack=1", "solis_1p8k-5g.yaml": "solis_1p-5g.yaml", "solis_3p-4g+.yaml": "solis_3p-4g.yaml", "sofar_hyd-es.yaml": "sofar_wifikit.yaml:mod=1", "sofar_tlx-g3.yaml": "sofar_g3.yaml", "zcs_azzurro-1ph-tl-v3.yaml": "sofar_lsw3.yaml:mppt=1&l=1", "zcs_azzurro-hyd-zss-hp.yaml": "sofar_g3.yaml:pack=1", "zcs_azzurro-ktl-v3.yaml": "sofar_g3.yaml" }
 
 PARAM_ = { CONF_MOD: CONF_MOD, CONF_MPPT: CONF_MPPT, CONF_PHASE: "l", CONF_PACK: CONF_PACK }