From 1f0aaf14bbcde076bd54bdf86af8f4c89de303b4 Mon Sep 17 00:00:00 2001
From: CiNcH83 <daniel.bechter@gmail.com>
Date: Mon, 27 Jul 2026 21:26:30 +0200
Subject: [PATCH] Huawei SUN2000: treat two battery units as single battery
 (BC) (#32034)

---
 .../meter/huawei-sun2000-hybrid.yaml          | 25 ++++---------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/templates/definition/meter/huawei-sun2000-hybrid.yaml b/templates/definition/meter/huawei-sun2000-hybrid.yaml
index c68db4408..a822266dc 100644
--- a/templates/definition/meter/huawei-sun2000-hybrid.yaml
+++ b/templates/definition/meter/huawei-sun2000-hybrid.yaml
@@ -44,6 +44,7 @@ params:
     usages: ["pv"]
     deprecated: true # curtailment now applies the HEMS-distributed percent directly
   - name: storageunit
+    deprecated: true
   - name: forceaccharging
     default: false
     advanced: true
@@ -288,11 +289,7 @@ render: |
     {{- include "modbus" . | indent 2 }}
     connectdelay: 1s
     register:
-      {{- if eq .storageunit "2" }}
-      address: 37743
-      {{- else }}
-      address: 37001
-      {{- end }}
+      address: 37765 # overall power
       type: holding
       decode: int32nan
     scale: -1
@@ -300,11 +297,7 @@ render: |
     source: modbus
     {{- include "modbus" . | indent 2 }}
     register:
-      {{- if eq .storageunit "2" }}
-      address: 37755 # [Energy storage unit 2] Total discharge
-      {{- else }}
-      address: 37068 # [Energy storage unit 1] Total discharge
-      {{- end }}
+      address: 37782 # overall energy discharged
       type: holding
       decode: uint32nan
     scale: 0.01
@@ -312,11 +305,7 @@ render: |
     source: modbus
     {{- include "modbus" . | indent 2 }}
     register:
-      {{- if eq .storageunit "2" }}
-      address: 37753 # [Energy storage unit 2] Total charge
-      {{- else }}
-      address: 37066 # [Energy storage unit 1] Total charge
-      {{- end }}
+      address: 37780 # overall energy charged
       type: holding
       decode: uint32nan
     scale: 0.01
@@ -324,11 +313,7 @@ render: |
     source: modbus
     {{- include "modbus" . | indent 2 }}
     register:
-      {{- if eq .storageunit "2" }}
-      address: 37738
-      {{- else }}
-      address: 37004
-      {{- end }}
+      address: 37760 # overall SoC
       type: holding
       decode: uint16nan
     scale: 0.1