From 9fb8be59568dc65ed0429719b4c81aee75fb975c Mon Sep 17 00:00:00 2001
From: premultiply <4681172+premultiply@users.noreply.github.com>
Date: Sun, 7 Jun 2026 19:07:47 +0200
Subject: [PATCH] SolarEdge Hybrid: add battery energy metering support
 (#30608)

---
 .../definition/meter/solaredge-hybrid.yaml    | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/templates/definition/meter/solaredge-hybrid.yaml b/templates/definition/meter/solaredge-hybrid.yaml
index 3274024af..90ffd2a75 100644
--- a/templates/definition/meter/solaredge-hybrid.yaml
+++ b/templates/definition/meter/solaredge-hybrid.yaml
@@ -108,13 +108,6 @@ render: |
           address: 62836 # Battery 1 Instantaneous Power
           type: holding
           decode: float32nans
-  energy:
-    source: sunspec
-    {{- include "modbus" . | indent 2 }}
-    value:
-      - 101:WH
-      - 103:WH
-    scale: 0.001
   maxacpower: {{ .maxacpower }} # W
   {{- end }}
   {{- if eq .usage "battery" }}
@@ -133,6 +126,22 @@ render: |
       address: 0xE184 # Battery 1 State of Energy (SOE)
       type: holding
       decode: float32nans
+  energy:
+    source: modbus
+    {{- include "modbus" . | indent 2 }}
+    register:
+      address: 0xE176 # Battery 1 Lifetime Export Energy Counter (discharged)
+      type: holding
+      decode: uint64
+    scale: 0.001
+  returnenergy:
+    source: modbus
+    {{- include "modbus" . | indent 2 }}
+    register:
+      address: 0xE17A # Battery 1 Lifetime Import Energy Counter (charged)
+      type: holding
+      decode: uint64
+    scale: 0.001
   batterymode:
     source: watchdog
     timeout: {{ .watchdog }}