Merge branch 'master' into fix/deprecated-device-registry-lookup

Author: Pho3niX90

.github/workflows/stale.yaml

@@ -20,8 +20,8 @@ jobs:
           stale-pr-message: "This PR has been automatically marked as stale due to inactivity. It will be closed if no further updates are made."
           close-issue-message: "Closing this issue due to inactivity. Feel free to reopen if needed."
           close-pr-message: "Closing this PR due to inactivity."
-          days-before-stale: 21 # Number of days before marking as stale
-          days-before-close: 7 # Number of days before closing after being marked stale
+          days-before-stale: 60 # Number of days before marking as stale
+          days-before-close: 21 # Number of days before closing after being marked stale
           exempt-issue-labels: "pinned,security,deprecation" # Issues with these labels won't be marked stale
           exempt-pr-labels: "pinned,security,deprecation"
           remove-stale-when-updated: true

custom_components/solis_modbus/__init__.py

@@ -120,6 +120,8 @@
 DISPATCH_SOC_HIGH_REG = 44110
 DISPATCH_SCHEDULE_BASE = 44116  # 6 periods x 14 registers
 DISPATCH_SCHEDULE_STRIDE = 14
+DISPATCH_LIMIT_UNIT = 100
+DISPATCH_LIMIT_DEFAULT = 0xFFFF
 
 # mode -> (44105 value, sign applied to power_watts); modes 3/4: +export/-import
 DISPATCH_MODES = {
@@ -143,6 +145,8 @@
         vol.Optional("disable_discharge"): vol.Coerce(bool),
         vol.Optional("soc_min"): vol.All(vol.Coerce(int), vol.Range(min=0, max=100)),
         vol.Optional("soc_max"): vol.All(vol.Coerce(int), vol.Range(min=0, max=100)),
+        vol.Optional("import_limit_watts"): vol.All(vol.Coerce(int), vol.Range(min=0, max=240000)),
+        vol.Optional("export_limit_watts"): vol.All(vol.Coerce(int), vol.Range(min=0, max=240000)),
         vol.Optional("failsafe_minutes", default=30): vol.All(vol.Coerce(int), vol.Range(min=1, max=1440)),
         vol.Optional("host"): vol.Coerce(str),
         vol.Optional("slave", default=1): vol.Coerce(int),
@@ -190,6 +194,24 @@ def _s32_words(value: int) -> list[int]:
     return [(raw >> 16) & 0xFFFF, raw & 0xFFFF]
 
 
+def _dispatch_system_limits(import_limit_watts, export_limit_watts) -> tuple[int, int, int]:
+    """Build 44102/44103/44104. Omitted = switch off + 0xFFFF (inverter default)."""
+
+    def raw(watts) -> int:
+        return (int(watts) + DISPATCH_LIMIT_UNIT // 2) // DISPATCH_LIMIT_UNIT
+
+    switches = 0
+    import_raw = DISPATCH_LIMIT_DEFAULT
+    export_raw = DISPATCH_LIMIT_DEFAULT
+    if import_limit_watts is not None:
+        switches |= 0b01
+        import_raw = raw(import_limit_watts)
+    if export_limit_watts is not None:
+        switches |= 0b10
+        export_raw = raw(export_limit_watts)
+    return switches, import_raw, export_raw
+
+
 async def async_remove_config_entry_device(hass: HomeAssistant, config_entry: ConfigEntry, device_entry: DeviceEntry) -> bool:
     """Remove a config entry from a device."""
     return True
@@ -354,15 +376,16 @@ async def service_dispatch(call: ServiceCall) -> None:
         function_value = _dispatch_function_value(call.data.get("pv_shutdown"), call.data.get("allow_grid_charge"), call.data.get("disable_discharge"))
         soc_low = int(call.data["soc_min"]) if call.data.get("soc_min") is not None else 0
         soc_high = int(call.data["soc_max"]) if call.data.get("soc_max") is not None else 100
+        switches, import_raw, export_raw = _dispatch_system_limits(call.data.get("import_limit_watts"), call.data.get("export_limit_watts"))
 
         # The dispatch block must be written as contiguous chunks (Ver3.4 doc):
         # scattered single-register writes get silently dropped/re-initialized,
         # especially under write-queue contention. Two atomic FC16 blocks:
-        #   global 44100-44104  = master, failsafe, no system caps (0xFFFF = default)
+        #   global 44100-44104  = master, failsafe, limit switch, import/export caps
         #   realtime 44105-44112 = mode, power(S32), function, SOC window
         # Global first so dispatch is active before the realtime block lands
         # (the function field is re-initialized unless the master is already on).
-        await controller.async_write_holding_registers(DISPATCH_MASTER_REG, [1, int(call.data.get("failsafe_minutes", 30)), 0, 0xFFFF, 0xFFFF])
+        await controller.async_write_holding_registers(DISPATCH_MASTER_REG, [1, int(call.data.get("failsafe_minutes", 30)), switches, import_raw, export_raw])
         await controller.async_write_holding_registers(DISPATCH_MODE_REG, [mode_value, *_s32_words(power_raw), function_value, soc_low, soc_high, 0, 0])
 
     async def service_dispatch_stop(call: ServiceCall) -> None:

custom_components/solis_modbus/client_manager.py

@@ -8,6 +8,12 @@
 
 _LOGGER = logging.getLogger(__name__)
 
+# Solis RS485_MODBUS protocol (Hybrid Inverter V3.1 / PV Grid-Connected Inverter V19),
+# section 3.2 "Inter-frame interval requirement": "More than 300ms communications frame
+# interval is required." Applies to every request on the link, read or write. 310ms gives
+# a small margin above the documented floor (see issue #480).
+MIN_INTER_FRAME_MS = 310
+
 
 class ModbusClientManager:
     _instance = None
@@ -102,7 +108,7 @@ async def inter_frame_wait(self, connection_id: str, is_write: bool = False) ->
         """Minimum spacing between Modbus operations on one TCP/serial link, across all controllers sharing it."""
         if connection_id not in self._clients:
             return
-        delay_ms = 100 if is_write else 50
+        delay_ms = MIN_INTER_FRAME_MS
         entry = self._clients[connection_id]
         current_time = time.perf_counter()
         last = float(entry.get("last_modbus_request", 0.0))

custom_components/solis_modbus/helpers.py

@@ -208,7 +208,8 @@ def mark_platform_entities_unavailable_for_base_sensors(hass: HomeAssistant, dis
         base = getattr(ent, "base_sensor", None)
         if base is not None and base in disabled_set:
             ent._attr_available = False
-            ent.schedule_update_ha_state()
+            if ent.hass is not None:
+                ent.schedule_update_ha_state()
 
 
 def get_poll_profile(config_entry: ConfigEntry) -> str:

custom_components/solis_modbus/manifest.json

@@ -14,5 +14,5 @@
   "requirements": [
     "pymodbus>=3.11.1"
   ],
-  "version": "4.2.3"
+  "version": "4.2.6"
 }

custom_components/solis_modbus/services.yaml

@@ -261,6 +261,26 @@ solis_dispatch:
           max: 100
           unit_of_measurement: "%"
           mode: box
+    import_limit_watts:
+      name: Import limit
+      description: System power-draw (grid import) upper limit. Omit to leave the inverter default; 0 is a valid cap
+      selector:
+        number:
+          min: 0
+          max: 240000
+          step: 100
+          unit_of_measurement: W
+          mode: box
+    export_limit_watts:
+      name: Export limit
+      description: System feed-in (grid export) upper limit. Omit to leave the inverter default; 0 is a valid cap
+      selector:
+        number:
+          min: 0
+          max: 240000
+          step: 100
+          unit_of_measurement: W
+          mode: box
     failsafe_minutes:
       name: Failsafe interval
       description: The inverter reverts to normal operation by itself if no dispatch write arrives within this window

tests/known_sensors_host.json

@@ -16,6 +16,7 @@
   "solis_modbus_1.2.3.4_43110_8",
   "solis_modbus_1.2.3.4_43110_9",
   "solis_modbus_1.2.3.4_43110_select",
+  "solis_modbus_1.2.3.4_43111_1",
   "solis_modbus_1.2.3.4_43132_select",
   "solis_modbus_1.2.3.4_43135_1",
   "solis_modbus_1.2.3.4_43135_2",
@@ -82,6 +83,8 @@
   "solis_modbus_1.2.3.4_solis_modbus_inverter_ac_coupling_total_power_generation",
   "solis_modbus_1.2.3.4_solis_modbus_inverter_ac_coupling_year_power_generation",
   "solis_modbus_1.2.3.4_solis_modbus_inverter_ac_coupling_yesterday_power_generation",
+  "solis_modbus_1.2.3.4_solis_modbus_inverter_ac_grid_port_active_power_phase_a",
+  "solis_modbus_1.2.3.4_solis_modbus_inverter_ac_grid_port_active_power_phase_b",
   "solis_modbus_1.2.3.4_solis_modbus_inverter_ac_grid_port_power",
   "solis_modbus_1.2.3.4_solis_modbus_inverter_ac_grid_port_total_energy_consumption",
   "solis_modbus_1.2.3.4_solis_modbus_inverter_ac_grid_port_total_energy_fed_in",
@@ -104,6 +107,7 @@
   "solis_modbus_1.2.3.4_solis_modbus_inverter_backup_month_energy",
   "solis_modbus_1.2.3.4_solis_modbus_inverter_backup_output_enabled_mirror",
   "solis_modbus_1.2.3.4_solis_modbus_inverter_backup_soc",
+  "solis_modbus_1.2.3.4_solis_modbus_inverter_backup_supply_value",
   "solis_modbus_1.2.3.4_solis_modbus_inverter_backup_today_energy",
   "solis_modbus_1.2.3.4_solis_modbus_inverter_backup_total_energy",
   "solis_modbus_1.2.3.4_solis_modbus_inverter_backup_voltage_reference",

tests/known_sensors_identification.json

@@ -16,6 +16,7 @@
   "solis_modbus_ID_SNAPSHOT_43110_8",
   "solis_modbus_ID_SNAPSHOT_43110_9",
   "solis_modbus_ID_SNAPSHOT_43110_select",
+  "solis_modbus_ID_SNAPSHOT_43111_1",
   "solis_modbus_ID_SNAPSHOT_43132_select",
   "solis_modbus_ID_SNAPSHOT_43135_1",
   "solis_modbus_ID_SNAPSHOT_43135_2",
@@ -82,6 +83,8 @@
   "solis_modbus_ID_SNAPSHOT_solis_modbus_inverter_ac_coupling_total_power_generation",
   "solis_modbus_ID_SNAPSHOT_solis_modbus_inverter_ac_coupling_year_power_generation",
   "solis_modbus_ID_SNAPSHOT_solis_modbus_inverter_ac_coupling_yesterday_power_generation",
+  "solis_modbus_ID_SNAPSHOT_solis_modbus_inverter_ac_grid_port_active_power_phase_a",
+  "solis_modbus_ID_SNAPSHOT_solis_modbus_inverter_ac_grid_port_active_power_phase_b",
   "solis_modbus_ID_SNAPSHOT_solis_modbus_inverter_ac_grid_port_power",
   "solis_modbus_ID_SNAPSHOT_solis_modbus_inverter_ac_grid_port_total_energy_consumption",
   "solis_modbus_ID_SNAPSHOT_solis_modbus_inverter_ac_grid_port_total_energy_fed_in",
@@ -104,6 +107,7 @@
   "solis_modbus_ID_SNAPSHOT_solis_modbus_inverter_backup_month_energy",
   "solis_modbus_ID_SNAPSHOT_solis_modbus_inverter_backup_output_enabled_mirror",
   "solis_modbus_ID_SNAPSHOT_solis_modbus_inverter_backup_soc",
+  "solis_modbus_ID_SNAPSHOT_solis_modbus_inverter_backup_supply_value",
   "solis_modbus_ID_SNAPSHOT_solis_modbus_inverter_backup_today_energy",
   "solis_modbus_ID_SNAPSHOT_solis_modbus_inverter_backup_total_energy",
   "solis_modbus_ID_SNAPSHOT_solis_modbus_inverter_backup_voltage_reference",

tests/known_sensors_serial.json

@@ -16,6 +16,7 @@
   "solis_modbus_SN_SNAPSHOT_43110_8",
   "solis_modbus_SN_SNAPSHOT_43110_9",
   "solis_modbus_SN_SNAPSHOT_43110_select",
+  "solis_modbus_SN_SNAPSHOT_43111_1",
   "solis_modbus_SN_SNAPSHOT_43132_select",
   "solis_modbus_SN_SNAPSHOT_43135_1",
   "solis_modbus_SN_SNAPSHOT_43135_2",
@@ -82,6 +83,8 @@
   "solis_modbus_SN_SNAPSHOT_solis_modbus_inverter_ac_coupling_total_power_generation",
   "solis_modbus_SN_SNAPSHOT_solis_modbus_inverter_ac_coupling_year_power_generation",
   "solis_modbus_SN_SNAPSHOT_solis_modbus_inverter_ac_coupling_yesterday_power_generation",
+  "solis_modbus_SN_SNAPSHOT_solis_modbus_inverter_ac_grid_port_active_power_phase_a",
+  "solis_modbus_SN_SNAPSHOT_solis_modbus_inverter_ac_grid_port_active_power_phase_b",
   "solis_modbus_SN_SNAPSHOT_solis_modbus_inverter_ac_grid_port_power",
   "solis_modbus_SN_SNAPSHOT_solis_modbus_inverter_ac_grid_port_total_energy_consumption",
   "solis_modbus_SN_SNAPSHOT_solis_modbus_inverter_ac_grid_port_total_energy_fed_in",
@@ -104,6 +107,7 @@
   "solis_modbus_SN_SNAPSHOT_solis_modbus_inverter_backup_month_energy",
   "solis_modbus_SN_SNAPSHOT_solis_modbus_inverter_backup_output_enabled_mirror",
   "solis_modbus_SN_SNAPSHOT_solis_modbus_inverter_backup_soc",
+  "solis_modbus_SN_SNAPSHOT_solis_modbus_inverter_backup_supply_value",
   "solis_modbus_SN_SNAPSHOT_solis_modbus_inverter_backup_today_energy",
   "solis_modbus_SN_SNAPSHOT_solis_modbus_inverter_backup_total_energy",
   "solis_modbus_SN_SNAPSHOT_solis_modbus_inverter_backup_voltage_reference",

tests/test_client_manager.py

@@ -1,8 +1,8 @@
 import unittest
 from unittest import IsolatedAsyncioTestCase
-from unittest.mock import MagicMock, patch
+from unittest.mock import AsyncMock, MagicMock, patch
 
-from custom_components.solis_modbus.client_manager import ModbusClientManager
+from custom_components.solis_modbus.client_manager import MIN_INTER_FRAME_MS, ModbusClientManager
 
 
 class TestModbusClientManager(unittest.TestCase):
@@ -91,6 +91,27 @@ async def test_inter_frame_wait_updates_shared_timestamp(self, mock_client_cls):
         await self.manager.inter_frame_wait("1.2.3.4:502", is_write=False)
         self.assertGreater(self.manager.get_last_modbus_request("1.2.3.4:502"), 0.0)
 
+    @patch("custom_components.solis_modbus.client_manager.AsyncModbusTcpClient")
+    @patch("custom_components.solis_modbus.client_manager.time.perf_counter")
+    @patch("custom_components.solis_modbus.client_manager.asyncio.sleep", new_callable=AsyncMock)
+    async def test_inter_frame_wait_enforces_min_interval_for_reads_and_writes(self, mock_sleep, mock_perf_counter, mock_client_cls):
+        mock_client_cls.return_value = MagicMock()
+        # Two operations back-to-back on the same connection: each should independently
+        # compute a wait based on MIN_INTER_FRAME_MS, regardless of is_write.
+        # Call sequence: [read: current_time, read: recorded last] [write: current_time, write: recorded last]
+        mock_perf_counter.side_effect = [0.0, 0.31, 0.32, 0.62]
+        self.manager.get_tcp_client("1.2.3.4", 502)
+
+        await self.manager.inter_frame_wait("1.2.3.4:502", is_write=False)
+        await self.manager.inter_frame_wait("1.2.3.4:502", is_write=True)
+
+        expected_delay_s = MIN_INTER_FRAME_MS / 1000
+        self.assertEqual(2, mock_sleep.call_count)
+        # Read: 0.0 elapsed since last (0.0) -> full MIN_INTER_FRAME_MS wait.
+        self.assertAlmostEqual(expected_delay_s, mock_sleep.call_args_list[0].args[0])
+        # Write: 10ms elapsed since last (0.31) -> remaining wait is MIN_INTER_FRAME_MS - 10ms.
+        self.assertAlmostEqual(expected_delay_s - 0.01, mock_sleep.call_args_list[1].args[0])
+
 
 if __name__ == "__main__":
     unittest.main()