Merge pull request #740 from canton7/feature/new-kh

Add KH version 1.33 (thanks to @ocl80)
nathanmarlor · Jan 26, 2025 · 094fcfe · 094fcfe
2 parents b5a7cf1 + 54890a5
commit 094fcfe
Show file tree

Hide file tree

Showing 8 changed files with 1,118 additions and 92 deletions.
diff --git a/custom_components/foxess_modbus/common/types.py b/custom_components/foxess_modbus/common/types.py
@@ -67,8 +67,9 @@ class Inv(Flag):
     H1_G2 = auto()
 
     KH_PRE119 = auto()
-    KH_119 = auto()
-    KH_SET = KH_PRE119 | KH_119
+    KH_PRE133 = auto()
+    KH_133 = auto()
+    KH_SET = KH_PRE119 | KH_PRE133 | KH_133
 
     H3 = auto()
     AIO_H3 = auto()

diff --git a/custom_components/foxess_modbus/entities/entity_descriptions.py b/custom_components/foxess_modbus/entities/entity_descriptions.py
diff --git a/custom_components/foxess_modbus/entities/modbus_fault_sensor.py b/custom_components/foxess_modbus/entities/modbus_fault_sensor.py
@@ -166,7 +166,7 @@ def __post_init__(self) -> None:
     masks={"Grid Lost Fault": ["Grid Voltage Fault", "Grid Frequency Fault"]},
 )
 
-H3_PRO_FAULTS = FaultSet(
+H3_PRO_KH_133_FAULTS = FaultSet(
     faults=[
         [
             "PV Over-voltage",
@@ -215,7 +215,7 @@ def __post_init__(self) -> None:
             None,
             None,
             "Meter Lost Fault",
-            None,
+            "BMS Lost Fault",  # KH_133 only,
             None,
             None,
             None,

diff --git a/custom_components/foxess_modbus/entities/remote_control_description.py b/custom_components/foxess_modbus/entities/remote_control_description.py
@@ -88,7 +88,7 @@
                 pwr_limit_bat_up=None,
                 pv_voltages=[31000, 31003, 31039, 31042],
             ),
-            models=Inv.KH_119,
+            models=Inv.KH_PRE133 | Inv.KH_133,
         ),
         RemoteControlAddressSpec(
             # The H3 doesn't support anything above 44005, and the active/reactive power regisers are 2 values

diff --git a/custom_components/foxess_modbus/inverter_profiles.py b/custom_components/foxess_modbus/inverter_profiles.py
@@ -84,7 +84,7 @@ def __init__(
 )
 # See https://github.com/nathanmarlor/foxess_modbus/pull/512
 KH_REGISTERS = SpecialRegisterConfig(
-    invalid_register_ranges=[(41001, 41006), (41012, 41012), (41019, 43999)],
+    invalid_register_ranges=[(41001, 41006), (41012, 41012), (41019, 43999), (31045, 31999)],
     individual_read_register_ranges=[(41000, 41999)],
 )
 # See https://github.com/nathanmarlor/foxess_modbus/discussions/553
@@ -308,7 +308,7 @@ def inverter_capacity(self, inverter_model: str) -> int:
         InverterModelProfile(InverterModel.KH, r"^KH([\d\.]+)").add_connection_type(
             ConnectionType.AUX,
             RegisterType.HOLDING,
-            versions={Version(1, 19): Inv.KH_PRE119, None: Inv.KH_119},
+            versions={Version(1, 19): Inv.KH_PRE119, Version(1, 33): Inv.KH_PRE133, None: Inv.KH_133},
             special_registers=KH_REGISTERS,
         ),
         # The H3 seems to use holding registers for everything

diff --git a/..._snapshots__/test_entity_descriptions/test_entity_descriptions_for_model[Inv.H3_PRO].json b/..._snapshots__/test_entity_descriptions/test_entity_descriptions_for_model[Inv.H3_PRO].json
@@ -1093,7 +1093,7 @@
         null,
         null,
         "Meter Lost Fault",
-        null,
+        "BMS Lost Fault",
         null,
         null,
         null,
-Original file line number
+Diff line change
@@ Expand Up / @@ -1093,7 +1093,7 @@ @@
             null,
             null,
             "Meter Lost Fault",
-            null,
+            "BMS Lost Fault",
             null,
             null,
             null,
@@ Expand Down @@