remote_control: fix invalid registers, add h180 registers

Author: MartB

custom_components/foxess_modbus/entities/modbus_remote_control_config.py

@@ -45,8 +45,8 @@ class ModbusRemoteControlAddressConfig:
     """Configured Max SoC"""
     invbatpower: list[int]
     """Current battery charge (negative) / discharge (positive) power"""
-    pwr_limit_bat_up: list[int] | None
-    """Prw_limit Bat_up, maximum power that the battery can accept"""
+    pwr_limit_bat_down: list[int] | None
+    """Prw_limit Bat_down, maximum power that the battery can accept"""
     pv_voltages: list[int]
     """Array of pvx_voltage addresses for PV strings"""
 

custom_components/foxess_modbus/entities/remote_control_description.py

@@ -22,7 +22,7 @@
                 max_soc=41010,
                 invbatpower=[11008],
                 battery_soc=[11036],
-                pwr_limit_bat_up=[44012],
+                pwr_limit_bat_down=[44012],
                 pv_voltages=[11000, 11003],
             ),
             models=Inv.H1_G1,
@@ -38,7 +38,7 @@
                 max_soc=None,
                 invbatpower=[31022],
                 battery_soc=[31024],
-                pwr_limit_bat_up=None,
+                pwr_limit_bat_down=None,
                 pv_voltages=[31000, 31003],
             ),
             models=Inv.H1_LAN,
@@ -53,7 +53,7 @@
                 max_soc=41010,
                 invbatpower=[31022],
                 battery_soc=[31024],
-                pwr_limit_bat_up=None,
+                pwr_limit_bat_down=None,
                 pv_voltages=[39070, 39072],
             ),
             models=Inv.H1_G2_SET,
@@ -69,7 +69,7 @@
                 max_soc=41010,
                 invbatpower=[11008],
                 battery_soc=[11036],
-                pwr_limit_bat_up=None,
+                pwr_limit_bat_down=None,
                 # Exists, but see https://github.com/nathanmarlor/foxess_modbus/discussions/666
                 pv_voltages=[11000, 11003, 11096, 11099],
             ),
@@ -85,13 +85,13 @@
                 max_soc=41010,
                 invbatpower=[31022],
                 battery_soc=[31024],
-                pwr_limit_bat_up=None,
+                pwr_limit_bat_down=None,
                 pv_voltages=[31000, 31003, 31039, 31042],
             ),
             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
+            # The H3 before 1.80 doesn't support anything above 44005, and the active/reactive power regisers are 2 values
             # The Kuara H3 doesn't support this, see https://github.com/nathanmarlor/foxess_modbus/issues/532
             holding=ModbusRemoteControlAddressConfig(
                 remote_enable=44000,
@@ -100,16 +100,30 @@
                 work_mode=41000,
                 work_mode_map=_NORMAL_WORK_MODE_MAP,
                 max_soc=41010,
-                invbatpower=[31022],
+                invbatpower=[31036],
                 battery_soc=[31038],
-                pwr_limit_bat_up=None,
+                pwr_limit_bat_down=None,
                 pv_voltages=[31000, 31003],
             ),
-            models=Inv.H3_SET & ~Inv.KUARA_H3 & ~Inv.AIO_H3_101 & ~Inv.AIO_H3_PRE101,
+            models=Inv.H3_PRE180 & ~Inv.KUARA_H3 & ~Inv.AIO_H3_101 & ~Inv.AIO_H3_PRE101,
+        ),
+        RemoteControlAddressSpec(
+            # H3 after 180 supports pwr_limit_bat_down
+            holding=ModbusRemoteControlAddressConfig(
+                remote_enable=44000,
+                timeout_set=44001,
+                active_power=[44003, 44002],
+                work_mode=41000,
+                work_mode_map=_NORMAL_WORK_MODE_MAP,
+                max_soc=41010,
+                invbatpower=[31036],
+                battery_soc=[31038],
+                pwr_limit_bat_down=[44012],
+                pv_voltages=[31000, 31003],
+            ),
+            models=Inv.H3_180,
         ),
         RemoteControlAddressSpec(
-            # The H3 doesn't support anything above 44005, and the active/reactive power regisers are 2 values
-            # The Kuara H3 doesn't support this, see https://github.com/nathanmarlor/foxess_modbus/issues/532
             holding=ModbusRemoteControlAddressConfig(
                 remote_enable=46001,
                 timeout_set=46002,
@@ -123,7 +137,7 @@
                 max_soc=46610,
                 invbatpower=[39238, 39237],
                 battery_soc=[37612, 38310],
-                pwr_limit_bat_up=[46019, 46018],
+                pwr_limit_bat_down=[46021, 46020],
                 pv_voltages=[39070, 39072, 39074, 39076, 39078, 39080],
             ),
             models=Inv.H3_PRO_SET | Inv.H3_SMART,

custom_components/foxess_modbus/remote_control_manager.py

@@ -34,7 +34,7 @@ def __init__(
             self._addresses.work_mode,
             self._addresses.max_soc,
             *self._addresses.invbatpower,
-            *(self._addresses.pwr_limit_bat_up if self._addresses.pwr_limit_bat_up is not None else []),
+            *(self._addresses.pwr_limit_bat_down if self._addresses.pwr_limit_bat_down is not None else []),
             *self._addresses.pv_voltages,
         ]
         self._modbus_addresses = [x for x in modbus_addresses if x is not None]
@@ -160,7 +160,7 @@ async def _update_charge(self) -> None:
         # we have enough PV to cover charge and part of house load, it'll cover the load in full then part of the
         # charge).
         #
-        # A better way seems to be to use the Pwr_limit_Bat_up register. This seems to hold the maximum input power
+        # A better way seems to be to use the Pwr_limit_Bat_down register. This seems to hold the maximum input power
         # that the battery can take, including things like BMS limits (which might not be exposed by the inverter,
         # depending on model). Therefore we can control the actual battery charge power so it's slightly below the
         # limit: this means that PV isn't being clipped (as it would fill the gap if it was).
@@ -184,7 +184,7 @@ async def _update_charge(self) -> None:
 
         # These are both negative
         # max_battery_charge_power_negative isn't available on the H1 over LAN
-        max_battery_charge_power_negative = self._read(self._addresses.pwr_limit_bat_up, signed=True)
+        max_battery_charge_power_negative = self._read(self._addresses.pwr_limit_bat_down, signed=True)
         current_battery_charge_power_negative = self._read(self._addresses.invbatpower, signed=True)
         if max_battery_charge_power_negative is None or current_battery_charge_power_negative is None:
             _LOGGER.debug(