Revert "meter/hybrid: fix pv energy readings in SunSpec hybrid inverter templates (#29955)"

This reverts commit 07b009391a.

templates/definition/meter/kostal-plenticore-gen2.yaml

@@ -66,20 +66,10 @@ render: |
       {{- include "modbus" . | indent 4 }}
       value: 160:3:DCW # string 3
   energy:
-    source: calc
-    add:
-    - source: sunspec
-      {{- include "modbus" . | indent 4 }}
-      value: 160:1:DCWH # string 1
-      scale: 0.001
-    - source: sunspec
-      {{- include "modbus" . | indent 4 }}
-      value: 160:2:DCWH # string 2
-      scale: 0.001
-    - source: sunspec
-      {{- include "modbus" . | indent 4 }}
-      value: 160:3:DCWH # string 3
-      scale: 0.001
+    source: sunspec
+    {{- include "modbus" . | indent 2 }}
+    value: 103:WH # total yield
+    scale: 0.001
   maxacpower: {{ .maxacpower }} # W
   {{- end }}
   {{- if eq .usage "battery" }}

templates/definition/meter/kostal-plenticore.yaml

@@ -60,20 +60,10 @@ render: |
       {{- include "modbus" . | indent 4 }}
       value: 160:3:DCW # string 3
   energy:
-    source: calc
-    add:
-    - source: sunspec
-      {{- include "modbus" . | indent 4 }}
-      value: 160:1:DCWH # string 1
-      scale: 0.001
-    - source: sunspec
-      {{- include "modbus" . | indent 4 }}
-      value: 160:2:DCWH # string 2
-      scale: 0.001
-    - source: sunspec
-      {{- include "modbus" . | indent 4 }}
-      value: 160:3:DCWH # string 3
-      scale: 0.001
+    source: sunspec
+    {{- include "modbus" . | indent 2 }}
+    value: 103:WH # total yield
+    scale: 0.001
   maxacpower: {{ .maxacpower }} # W
   {{- end }}
   {{- if eq .usage "battery" }}

templates/definition/meter/solaredge-hybrid.yaml

@@ -108,6 +108,13 @@ 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" }}