Personal fork: metadata, changelog, simulated-inverter test

Author: rusty-bit

CHANGELOG.md

@@ -0,0 +1,13 @@
+# Changelog (personal fork)
+
+## 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.
+- Fix: pymodbus >= 3.10 renamed `slave=` to `device_id=`; the unit id is now passed
+  correctly for any pymodbus version.
+- Fix: writes share the polling lock; freshly written values are held for 30 s so a
+  stale poll does not flip the UI back.
+- Fix: failed writes raise an error in HA and are logged.
+- Fix: address offset was applied twice on reads; RTU-over-TCP client construction.
+- New: `PV Power` sensor = PV1 + PV2 + PV3 + PV4 power.
+- New: `compute: sum` + `sources:` supported in register maps for derived sensors.

README.md

@@ -1,5 +1,12 @@
 # Deye Modbus for Home Assistant
 
+> **Personal fork** of [Developer089/deye-modbus-ha](https://github.com/Developer089/deye-modbus-ha).
+> Changes: settings writes fixed (FC16 instead of FC06, pymodbus 3.10+ unit id),
+> write errors shown in HA, and a total **PV Power** sensor. See `CHANGELOG.md`.
+> The integration domain is still `deye_modbus`, so existing entity IDs are kept.
+> Remove the upstream HACS install before using this one.
+
+
 Local Home Assistant integration for **Deye three-phase hybrid inverters** (SUN-\*K-SG04LP3 / SG05LP3 family, including the SUN-12K-SG05LP3). It talks Modbus TCP directly to the inverter's WiFi/LAN logger or an RS485-to-TCP gateway — no cloud, no SolarMAN account required.
 
 [![HACS Custom](https://img.shields.io/badge/HACS-Custom-41BDF5.svg)](https://hacs.xyz/)

custom_components/deye_modbus/manifest.json

@@ -1,6 +1,6 @@
 {
   "domain": "deye_modbus",
-  "name": "Deye Modbus (Hybrid Inverter)",
+  "name": "Deye Modbus (Hybrid Inverter) - personal fork",
   "codeowners": [
     "@Developer089"
   ],
@@ -16,5 +16,5 @@
   "requirements": [
     "pymodbus>=3.5.0"
   ],
-  "version": "0.1.1"
+  "version": "0.1.3"
 }

tests/sim_inverter_test.py

@@ -0,0 +1,67 @@
+"""Simulated-inverter test (no Home Assistant needed).
+
+Starts a local Modbus server that, like a Deye, rejects FC06, then checks that
+reads, FC16 writes, read-back and the PV Power sum work.
+Run from repo root:  pip install pymodbus pyyaml && python tests/sim_inverter_test.py
+"""
+import os, sys, types, asyncio, logging, yaml
+REPO = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+logging.basicConfig(level=logging.WARNING)
+# --- minimal homeassistant stubs
+ha=types.ModuleType("homeassistant"); sys.modules["homeassistant"]=ha
+core=types.ModuleType("homeassistant.core"); core.HomeAssistant=object; sys.modules["homeassistant.core"]=core
+h=types.ModuleType("homeassistant.helpers"); sys.modules["homeassistant.helpers"]=h
+uc=types.ModuleType("homeassistant.helpers.update_coordinator")
+class UpdateFailed(Exception): pass
+class DataUpdateCoordinator:
+    def __class_getitem__(cls, i): return cls
+    def __init__(self, hass, logger, name, update_interval): self.data=None
+    async def async_request_refresh(self): self.data = await self._async_update_data()
+    def async_set_updated_data(self, d): self.data=d
+uc.UpdateFailed=UpdateFailed; uc.DataUpdateCoordinator=DataUpdateCoordinator
+sys.modules["homeassistant.helpers.update_coordinator"]=uc
+sys.path.insert(0,REPO + "/custom_components/deye_modbus")
+import importlib.util
+spec=importlib.util.spec_from_file_location("coord",REPO + "/custom_components/deye_modbus/coordinator.py")
+coord=importlib.util.module_from_spec(spec); sys.modules["coord"]=coord; spec.loader.exec_module(coord)
+
+from pymodbus.server import StartAsyncTcpServer
+from pymodbus.datastore import ModbusServerContext, ModbusDeviceContext
+from pymodbus.datastore import ModbusSparseDataBlock
+from pymodbus.pdu import ExceptionResponse
+
+class DeyeBlock(ModbusSparseDataBlock): pass
+vals={i:0 for i in range(0,1000)}
+vals.update({108:100,117:20,672:1200,673:850,674:0,675:300,588:55})
+block=DeyeBlock(vals)
+dev=ModbusDeviceContext(hr=block)
+ctx=ModbusServerContext(devices={1:dev},single=False)
+
+async def main():
+    import pymodbus.pdu.register_message as rm
+    # emulate Deye: FC06 not supported
+    pass
+    async def reject(self, context, device_id): return ExceptionResponse(self.function_code, 1)
+    rm.WriteSingleRegisterRequest.datastore_update=reject
+    task=asyncio.create_task(StartAsyncTcpServer(context=ctx,address=("127.0.0.1",15020)))
+    await asyncio.sleep(1)
+    m=yaml.safe_load(open(REPO + "/custom_components/deye_modbus/maps/sun_3ph_hybrid.yaml"))
+    initmod=open(REPO + "/custom_components/deye_modbus/__init__.py").read()
+    ns={}
+    src=initmod[initmod.index("_REGISTER_FIELDS"):initmod.index("async def async_setup_entry")]
+    exec(src,ns)
+    sensors,controls=ns["_auto_inject_readbacks"](m["sensors"],m["controls"])
+    regs=[coord.RegisterDef(**{k:v for k,v in r.items() if k in ns["_REGISTER_FIELDS"]}) for r in sensors]
+    c=coord.DeyeModbusCoordinator(None,"127.0.0.1",15020,1,regs,15)
+    await c.async_request_refresh()
+    d=c.data
+    print("PV power:",d["pv_power"],"| max charge rb:",d["rb_batt_max_charge_current"],"| low soc rb:",d["rb_batt_low_soc"])
+    # old-style FC06 write would fail here; new write uses FC16
+    ok=await c.write_single_register(108,60); ok2=await c.write_single_register(117,35)
+    cl=await c._ensure_client(); r=await cl.read_holding_registers(108,count=10,device_id=1)
+    print("writes ok:",ok,ok2,"| device now 108,117:",r.registers[0],r.registers[9])
+    print("after refresh rb:",c.data["rb_batt_max_charge_current"],c.data["rb_batt_low_soc"])
+    # FC06 directly, to prove emulation rejects it
+    cl=await c._ensure_client(); rr=await cl.write_register(108,50,device_id=1); print("raw FC06 isError:",rr.isError())
+    await c.async_close(); task.cancel()
+asyncio.run(main())