Add advanced settings (SmartLoad, peak shaving, ARC, parallel, meter)

Registers from the Deye MODBUS RTU three-phase protocol V105.1, cross-checked
against the ha-solarman deye_p3 and kellerza/sunsynk three-phase maps.
Switch/select controls accept a bit mask and write only that field, with a
fresh read inside the write lock. Settings that can cut communication or
break metering are exposed read-only.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

Author: rusty-bit

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog (personal fork)
 
+## 0.1.4
+- New: advanced settings from the SolarMAN app (SmartLoad Setting / Advanced Function-1).
+  - Writable: SmartLoad Setup (133), GEN Connect To Grid Input (189), ARC Fault
+    Detection (181), Gen/Grid Peak Shaving on/off (178 bit fields) and power (190/191),
+    Asymmetric Phase Feeding (237).
+  - Read-only (disabled by default): Parallel, Equipment Mode, Parallel Modbus SN (336),
+    DRM (178), Backup Delay (209), AC Couple Setup (234), MPPT Scan (341), Grid Check
+    Source (344), Meter Select (345), CT Ratio (347).
+  - Not included (no documented register): BMS-stop, Neutral to earth bonding,
+    EX_MeterCT, Grid Tie Meter2, Low_Noise.
+- New: `mask:` on switch/select controls writes only that bit field. The register is
+  re-read inside the write lock, so flags packed into one register don't clobber each other.
+- Change: sensor `mask:` now shifts the field down to bit 0.
+
 ## 0.1.3 (personal fork of upstream 0.1.1)
 - Fix: settings (battery currents, SOC limits, work mode, switches, TOU) were never
   applied. Deye hybrids reject Modbus FC06; all writes now use FC16.

README.md

@@ -113,6 +113,9 @@ Rebadged units on the same platform (Sunsynk, etc.) will generally work too.
 | Select | Work Mode (Selling First / Zero Export To Load / Zero Export To CT) |
 | Number | Max Sell Power, Max Grid Output Power, Active Power Regulation, Battery Max Charge/Discharge Current, Grid Charge Current, Battery Shutdown/Restart/Low SOC, Battery Capacity, Grid Voltage High/Low limits |
 | Time-of-use | 6 slots × Time / Power / SOC / Charge Source (Off / Grid / Generator / Grid+Generator) |
+| Advanced (fork) | SmartLoad Setup, GEN Connect To Grid Input, ARC Fault Detection, Gen/Grid Peak Shaving + power, Asymmetric Phase Feeding |
+
+**Advanced settings, read-only** (disabled by default): Parallel, Equipment Mode, Parallel Modbus SN, DRM, Backup Delay, AC Couple Setup, MPPT Scan, Grid Check Source, Meter Select, CT Ratio. These are read-only because a wrong value can cut Modbus communication or break zero-export metering; change them in the SolarMAN app.
 
 > **Disabled-by-default entities.** To keep the device tidy, some entities ship disabled: PV3/PV4, per-phase inverter/load detail, generator/backup, grid protection limits, and all time-of-use slots. Enable any of them under the device's **Entities** list → open the entity → **Settings** → toggle *Enabled*.
 

custom_components/deye_modbus/coordinator.py

@@ -57,6 +57,18 @@ def _unit_kw(method) -> str | None:
     return None
 
 
+def parse_mask(value: Any) -> int | None:
+    """Accept a mask given as int or as a string such as "0x30" / "0b1100"."""
+    if value is None:
+        return None
+    return int(str(value), 0) & 0xFFFFFFFF
+
+
+def mask_shift(mask: int) -> int:
+    """Bit position of the lowest set bit, used to align a field with its mask."""
+    return (mask & -mask).bit_length() - 1 if mask else 0
+
+
 @dataclass
 class RegisterDef:
     """One decoded value read from the inverter."""
@@ -74,7 +86,7 @@ class RegisterDef:
     signed: bool = False
     word_order: str = "high_low"             # 32-bit word order: high_low | low_high
     options: dict[int, str] | None = None    # enum mapping for sensors (0 -> "text")
-    mask: int | None = None                  # bitmask applied to raw before sign/scale
+    mask: int | str | None = None            # bit field: (raw & mask) >> lowest mask bit
     icon: str | None = None
     enabled_default: bool = True             # entity_registry_enabled_default
     precision: int | None = None             # suggested_display_precision (decimals)
@@ -112,6 +124,8 @@ def __init__(
         self._polled = [r for r in registers if not r.compute]
         # address -> (raw word, expiry) for values we just wrote
         self._pending: dict[int, tuple[int, float]] = {}
+        for r in registers:
+            r.mask = parse_mask(r.mask)
 
     def _addr(self, addr: int) -> int:
         return int(addr) - self._addr_off if self._addr_off else int(addr)
@@ -222,7 +236,7 @@ def _decode(self, r: RegisterDef, raw, start) -> Any:
         if r.count == 1:
             v = chunk[0]
             if r.mask is not None:
-                v &= r.mask
+                v = (v & r.mask) >> mask_shift(r.mask)
             if r.signed and v >= 0x8000:
                 v -= 0x10000
             return (v - r.offset) * r.scale
@@ -233,7 +247,7 @@ def _decode(self, r: RegisterDef, raw, start) -> Any:
                 high, low = chunk[0], chunk[1]
             v = (high << 16) | low
             if r.mask is not None:
-                v &= r.mask
+                v = (v & r.mask) >> mask_shift(r.mask)
             if r.signed and v >= 0x80000000:
                 v -= 0x100000000
             return (v - r.offset) * r.scale
@@ -262,26 +276,58 @@ async def _read_holding(self, address, count):
     async def write_multiple_registers(self, address: int, values: list[int]) -> bool:
         """Write with FC16 - the only write function Deye inverters accept."""
         vals = [int(v) & 0xFFFF for v in values]
-        a = self._addr(address)
+        async with self._lock:
+            ok = await self._write_locked(address, vals)
+        if ok:
+            await self._after_write(address, vals)
+        return ok
+
+    async def write_register_bits(self, address: int, mask: int, value: int) -> bool:
+        """Change only the bits under `mask` in one register, keeping the rest.
+
+        `value` is already shifted into position. The register is read fresh from
+        the inverter inside the lock, so several fields packed into one register
+        (e.g. 178, peak-shaving flags) cannot overwrite each other.
+        """
+        mask &= 0xFFFF
         async with self._lock:
             try:
-                client = await self._ensure_client()
-                method = client.write_registers
-                rr = await method(a, vals, **self._unit_kwargs(method))
+                raw = await self._read_holding(address, 1)
             except Exception as err:  # noqa: BLE001
-                _LOGGER.error("Write %s to register %s failed: %s", vals, address, err)
-                await self._reset_client()
-                return False
-            if rr is None or (getattr(rr, "isError", None) and rr.isError()):
-                _LOGGER.error("Inverter rejected write %s to register %s: %s", vals, address, rr)
+                raw = None
+                _LOGGER.debug("Read before bit write of %s raised %s", address, err)
+            if not raw:
+                _LOGGER.error("Cannot change bits 0x%04X of register %s: current value unreadable", mask, address)
                 return False
-            expiry = time.monotonic() + PENDING_WRITE_SECONDS
-            for i, v in enumerate(vals):
-                self._pending[address + i] = (v, expiry)
+            new = (int(raw[0]) & ~mask & 0xFFFF) | (int(value) & mask)
+            ok = await self._write_locked(address, [new])
+        if ok:
+            await self._after_write(address, [new])
+        return ok
+
+    async def _write_locked(self, address: int, vals: list[int]) -> bool:
+        """FC16 write; caller must hold self._lock."""
+        a = self._addr(address)
+        try:
+            client = await self._ensure_client()
+            method = client.write_registers
+            rr = await method(a, vals, **self._unit_kwargs(method))
+        except Exception as err:  # noqa: BLE001
+            _LOGGER.error("Write %s to register %s failed: %s", vals, address, err)
+            await self._reset_client()
+            return False
+        if rr is None or (getattr(rr, "isError", None) and rr.isError()):
+            _LOGGER.error("Inverter rejected write %s to register %s: %s", vals, address, rr)
+            return False
+        expiry = time.monotonic() + PENDING_WRITE_SECONDS
+        for i, v in enumerate(vals):
+            self._pending[address + i] = (v, expiry)
         _LOGGER.debug("Wrote %s to register %s", vals, address)
+        return True
+
+    async def _after_write(self, address: int, vals: list[int]) -> None:
         self._patch_data(address, vals)
         await self.async_request_refresh()
-        return True
 
     async def write_single_register(self, address: int, value: int) -> bool:
         # Deliberately FC16 with one value, not FC06.

custom_components/deye_modbus/manifest.json

@@ -16,5 +16,5 @@
   "requirements": [
     "pymodbus>=3.5.0"
   ],
-  "version": "0.1.3"
+  "version": "0.1.4"
 }

custom_components/deye_modbus/maps/sun_3ph_hybrid.yaml

@@ -787,6 +787,98 @@ sensors:
     state_class: total_increasing
 
 
+  # ---------------------------------------------------------------- advanced settings (read-only)
+  # Installer settings shown under "Advanced Function" in the SolarMAN app.
+  # Exposed read-only on purpose: a wrong value here can cut Modbus
+  # communication (Modbus SN / parallel role), break zero-export metering
+  # (CT ratio / meter), or is marked "engineer only" in the protocol.
+  # Source: Deye MODBUS RTU three-phase protocol V105.1 (2023-10-06).
+  - name: Parallel
+    unique_id: adv_parallel
+    register_type: holding
+    address: 336
+    mask: 0x0001
+    options: {0: Disable, 1: Enable}
+    icon: mdi:link-variant
+    enabled_default: false
+
+  - name: Equipment Mode
+    unique_id: adv_equipment_mode
+    register_type: holding
+    address: 336
+    mask: 0x0002
+    options: {0: Slave, 1: Master}
+    icon: mdi:account-supervisor
+    enabled_default: false
+
+  - name: Parallel Modbus SN
+    unique_id: adv_modbus_sn
+    register_type: holding
+    address: 336
+    mask: 0xFC00
+    icon: mdi:numeric
+    enabled_default: false
+
+  - name: DRM
+    unique_id: adv_drm
+    register_type: holding
+    address: 178
+    mask: 0x3000
+    options: {2: Disable, 3: Enable}
+    icon: mdi:shield-check
+    enabled_default: false
+
+  - name: Backup Delay
+    unique_id: adv_backup_delay
+    register_type: holding
+    address: 209
+    unit_of_measurement: s
+    icon: mdi:timer-outline
+    enabled_default: false
+
+  - name: CT Ratio
+    unique_id: adv_ct_ratio
+    register_type: holding
+    address: 347
+    icon: mdi:current-ac
+    enabled_default: false
+
+  - name: Grid Check Source
+    unique_id: adv_grid_check_source
+    register_type: holding
+    address: 344
+    mask: 0x0001
+    options: {0: CT, 1: Meter}
+    icon: mdi:meter-electric
+    enabled_default: false
+
+  - name: Meter Select
+    unique_id: adv_meter_select
+    register_type: holding
+    address: 345
+    options: {0: None, 1: Eastron, 2: CHNT}
+    icon: mdi:meter-electric-outline
+    enabled_default: false
+
+  - name: MPPT Scan
+    unique_id: adv_mppt_scan
+    register_type: holding
+    address: 341
+    mask: 0x0004
+    options: {0: Disable, 1: Enable}
+    icon: mdi:solar-panel
+    enabled_default: false
+
+  # Protocol V105 only documents 0 = disable / 1 = enable; newer firmware
+  # stores the coupling side, so other values are shown as the raw number.
+  - name: AC Couple Setup
+    unique_id: adv_ac_couple
+    register_type: holding
+    address: 234
+    options: {0: Disable}
+    icon: mdi:transmission-tower
+    enabled_default: false
+
 # =====================================================================
 # Writable controls (holding registers 60-499, written with FC06/FC16).
 # Each control gets a hidden read-back sensor injected automatically so the
@@ -1367,3 +1459,101 @@ controls:
         value: 2
       - label: Grid + Generator
         value: 3
+
+  # ------------------------------------------------------------- advanced functions
+  # SolarMAN app: SmartLoad Setting / Advanced Function-1.
+  # Source: Deye MODBUS RTU three-phase protocol V105.1, cross-checked against
+  # the ha-solarman (deye_p3) and kellerza/sunsynk three-phase definitions.
+  - type: select
+    name: SmartLoad Setup
+    unique_id: smartload_setup
+    register_type: holding
+    address: 133
+    icon: mdi:lightning-bolt-circle
+    entity_category: config
+    options:
+      - label: Generator Input
+        value: 0
+      - label: SmartLoad Output
+        value: 1
+      - label: Micro Inverter Input
+        value: 2
+
+  - type: switch
+    name: GEN Connect To Grid Input
+    unique_id: gen_to_grid_input
+    register_type: holding
+    address: 189
+    on_value: 1
+    off_value: 0
+    icon: mdi:generator-stationary
+    entity_category: config
+
+  - type: switch
+    name: ARC Fault Detection
+    unique_id: arc_fault_mode
+    register_type: holding
+    address: 181
+    on_value: 1
+    off_value: 0
+    icon: mdi:flash-alert
+    entity_category: config
+
+  # Register 178 packs 2-bit flags: 10 = disable, 11 = enable (00/01 = no change).
+  - type: switch
+    name: Gen Peak Shaving
+    unique_id: gen_peak_shaving
+    register_type: holding
+    address: 178
+    mask: 0x000C
+    on_value: 3
+    off_value: 2
+    icon: mdi:generator-stationary
+    entity_category: config
+
+  - type: number
+    name: Gen Peak Shaving Power
+    unique_id: gen_peak_shaving_power
+    register_type: holding
+    address: 190
+    min: 0
+    max: 16000
+    step: 100
+    unit_of_measurement: W
+    mode: box
+    write_factor: 1
+    entity_category: config
+
+  - type: switch
+    name: Grid Peak Shaving
+    unique_id: grid_peak_shaving
+    register_type: holding
+    address: 178
+    mask: 0x0030
+    on_value: 3
+    off_value: 2
+    icon: mdi:transmission-tower
+    entity_category: config
+
+  - type: number
+    name: Grid Peak Shaving Power
+    unique_id: grid_peak_shaving_power
+    register_type: holding
+    address: 191
+    min: 0
+    max: 16000
+    step: 100
+    unit_of_measurement: W
+    mode: box
+    write_factor: 1
+    entity_category: config
+
+  - type: switch
+    name: Asymmetric Phase Feeding
+    unique_id: asymmetric_phase_feeding
+    register_type: holding
+    address: 237
+    on_value: 1
+    off_value: 0
+    icon: mdi:sine-wave
+    entity_category: config