From b40f06d48c192f51b23c939e33f81718ad4cd006 Mon Sep 17 00:00:00 2001
From: andig <andi@evcc.io>
Date: Mon, 1 Jun 2026 19:07:26 +0200
Subject: [PATCH] Meter (Solis Hybrid): drop coarse pv and battery energy
 registers (#30411)

---
 .../definition/meter/solis-hybrid-s.yaml      | 20 ++++++-------------
 templates/definition/meter/solis-hybrid.yaml  | 20 ++++++-------------
 2 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/templates/definition/meter/solis-hybrid-s.yaml b/templates/definition/meter/solis-hybrid-s.yaml
index f4c0e58e1..eb64454e7 100644
--- a/templates/definition/meter/solis-hybrid-s.yaml
+++ b/templates/definition/meter/solis-hybrid-s.yaml
@@ -97,13 +97,9 @@ render: |
       type: input
       address: 33057 # Total DC output power (PV Power)
       decode: uint32
-  energy:
-    source: modbus
-    {{- include "modbus" . | indent 2 }}
-    register:
-      address: 33029 # Total energy generation
-      type: input
-      decode: uint32
+  # energy (33029 Total energy generation) intentionally omitted: the register
+  # has 1 kWh resolution, so the 15min energy history quantizes to 4 kW steps.
+  # History is integrated from power instead (see issue #30407).
   maxacpower: {{ .maxacpower }} # W
   {{- end }}
   {{- if eq .usage "battery" }}
@@ -129,13 +125,9 @@ render: |
         scale: 2
       - source: const
         value: -1
-  energy:
-    source: modbus
-    {{- include "modbus" . | indent 2 }}
-    register:
-      address: 33165 # Battery total discharge energy
-      type: input
-      decode: uint32
+  # energy (33165 Battery total discharge energy) intentionally omitted: the
+  # register has 1 kWh resolution, so the 15min energy history quantizes to 4 kW
+  # steps. History is integrated from power instead (see issue #30407).
   soc:
     source: modbus
     {{- include "modbus" . | indent 2 }}
diff --git a/templates/definition/meter/solis-hybrid.yaml b/templates/definition/meter/solis-hybrid.yaml
index 275a13cb5..dcd6a73c6 100644
--- a/templates/definition/meter/solis-hybrid.yaml
+++ b/templates/definition/meter/solis-hybrid.yaml
@@ -84,13 +84,9 @@ render: |
       type: input
       address: 33057 # Total DC output power (PV Power)
       decode: uint32
-  energy:
-    source: modbus
-    {{- include "modbus" . | indent 2 }}
-    register:
-      address: 33029 # Total energy generation
-      type: input
-      decode: uint32
+  # energy (33029 Total energy generation) intentionally omitted: the register
+  # has 1 kWh resolution, so the 15min energy history quantizes to 4 kW steps.
+  # History is integrated from power instead (see issue #30407).
   maxacpower: {{ .maxacpower }} # W
   {{- end }}
   {{- if eq .usage "battery" }}
@@ -102,13 +98,9 @@ render: |
       address: 33149 # Battery power
       decode: int32
     scale: -1
-  energy:
-    source: modbus
-    {{- include "modbus" . | indent 2 }}
-    register:
-      address: 33165 # Battery total discharge energy
-      type: input
-      decode: uint32
+  # energy (33165 Battery total discharge energy) intentionally omitted: the
+  # register has 1 kWh resolution, so the 15min energy history quantizes to 4 kW
+  # steps. History is integrated from power instead (see issue #30407).
   soc:
     source: modbus
     {{- include "modbus" . | indent 2 }}