From d979f078ad1baba0f4fc2ce968918cbb9174f45c Mon Sep 17 00:00:00 2001
From: Frank Walburg <23580715+walburgf@users.noreply.github.com>
Date: Tue, 23 Sep 2025 23:37:06 +0200
Subject: [PATCH] Goodwe Hybrid: fix grid currents (#23728)

---
 templates/definition/meter/goodwe-hybrid.yaml | 64 +++++++++++++------
 1 file changed, 43 insertions(+), 21 deletions(-)

diff --git a/templates/definition/meter/goodwe-hybrid.yaml b/templates/definition/meter/goodwe-hybrid.yaml
index 75fd45c42..f1d9013e8 100644
--- a/templates/definition/meter/goodwe-hybrid.yaml
+++ b/templates/definition/meter/goodwe-hybrid.yaml
@@ -40,28 +40,50 @@ render: |
       type: holding
       decode: float32
     scale: 0.001
+  powers:
+    - source: modbus
+      {{- include "modbus" . | indent 4 }}
+      register:
+        address: 36019 # Meter Active Power R, W
+        type: holding
+        decode: int32
+      scale: -1
+    - source: modbus
+      {{- include "modbus" . | indent 4 }}
+      register:
+        address: 36021 # Meter Active Power S, W
+        type: holding
+        decode: int32
+      scale: -1
+    - source: modbus
+      {{- include "modbus" . | indent 4 }}
+      register:
+        address: 36023 # Meter Active Power T, W
+        type: holding
+        decode: int32
+      scale: -1
   currents:
-  - source: modbus
-    {{- include "modbus" . | indent 2 }}
-    register:
-      address: 35122 # R phase Grid current, A
-      type: holding
-      decode: uint16
-    scale: 0.1
-  - source: modbus
-    {{- include "modbus" . | indent 2 }}
-    register:
-      address: 35127 # S phase Grid current, A
-      type: holding
-      decode: uint16
-    scale: 0.1
-  - source: modbus
-    {{- include "modbus" . | indent 2 }}
-    register:
-      address: 35132 # T phase Grid current, A
-      type: holding
-      decode: uint16
-    scale: 0.1
+    - source: modbus
+      {{- include "modbus" . | indent 4 }}
+      register:
+        address: 36055 # Meter Current R, A
+        type: holding
+        decode: uint16
+      scale: 0.1
+    - source: modbus
+      {{- include "modbus" . | indent 4 }}
+      register:
+        address: 36056 # Meter Current S, A
+        type: holding
+        decode: uint16
+      scale: 0.1
+    - source: modbus
+      {{- include "modbus" . | indent 4 }}
+      register:
+        address: 36057 # Meter Current T, A  
+        type: holding
+        decode: uint16
+      scale: 0.1
   {{- end }}
   {{- if eq .usage "pv" }}
   power: