From 851b3c9066f03b07f540f858decd68b7091ebbea Mon Sep 17 00:00:00 2001
From: premultiply <4681172+premultiply@users.noreply.github.com>
Date: Mon, 12 Sep 2022 13:17:20 +0200
Subject: [PATCH] Enhanced SunGrow Templates (#4328)

---
 .../definition/meter/sungrow-hybrid.yaml      | 27 ++++++++++++++++++-
 .../definition/meter/sungrow-inverter.yaml    | 23 +++++++++++++---
 templates/docs/meter/sungrow-hybrid_0.yaml    |  2 +-
 templates/docs/meter/sungrow-inverter_0.yaml  |  2 +-
 4 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/templates/definition/meter/sungrow-hybrid.yaml b/templates/definition/meter/sungrow-hybrid.yaml
index 4c05adf6d..c34f75b4c 100644
--- a/templates/definition/meter/sungrow-hybrid.yaml
+++ b/templates/definition/meter/sungrow-hybrid.yaml
@@ -3,7 +3,7 @@ covers: ["sungrow"]
 products:
   - brand: Sungrow
     description:
-      generic: Hybrid Inverter
+      generic: SH Series Hybrid Inverter
 guidedsetup:
   enable: true
 requirements:
@@ -15,6 +15,7 @@ params:
     choice: ["grid", "pv", "battery"]
   - name: modbus
     choice: ["rs485", "tcpip"]
+    baudrate: 9600
 render: |
   type: custom
   {{- if eq .usage "grid" }}
@@ -26,6 +27,14 @@ render: |
       address: 13009 # Export power
       decode: int32s
     scale: -1
+  energy:
+    source: modbus
+    {{- include "modbus" . | indent 2 }}
+    register:
+      address: 13036 # Total Import Energy
+      type: input
+      decode: uint32s
+    scale: 0.1
   {{- end }}
   {{- if eq .usage "pv" }}
   power:
@@ -35,6 +44,14 @@ render: |
       address: 5016 # Total DC power
       type: input
       decode: uint32s
+  energy:
+    source: modbus
+    {{- include "modbus" . | indent 2 }}
+    register:
+      address: 13002 # Total PV Generation
+      type: input
+      decode: uint32s
+    scale: 0.1
   {{- end }}
   {{- if eq .usage "battery" }}
   power:
@@ -63,6 +80,14 @@ render: |
           address: 13000 # Battery running state
           decode: bool16
           bitmask: 4 # Discharging
+  energy:
+    source: modbus
+    {{- include "modbus" . | indent 2 }}
+    register:
+      address: 13026 # Total battery discharge energy
+      type: input
+      decode: uint32s
+    scale: 0.1
   soc:
     source: modbus
     {{- include "modbus" . | indent 2 }}
diff --git a/templates/definition/meter/sungrow-inverter.yaml b/templates/definition/meter/sungrow-inverter.yaml
index 80d31edba..b16fdaed2 100644
--- a/templates/definition/meter/sungrow-inverter.yaml
+++ b/templates/definition/meter/sungrow-inverter.yaml
@@ -2,7 +2,7 @@ template: sungrow-inverter
 products:
   - brand: Sungrow
     description:
-      generic: Inverter
+      generic: SG Series Inverter
 guidedsetup:
   enable: true
 requirements:
@@ -14,6 +14,7 @@ params:
     choice: ["grid", "pv"]
   - name: modbus
     choice: ["rs485", "tcpip"]
+    baudrate: 9600
 render: |
   type: custom
   {{- if eq .usage "grid" }}
@@ -22,15 +23,31 @@ render: |
     {{- include "modbus" . | indent 2 }}
     register:
       type: input
-      address: 5082 # Export power
+      address: 5082 # Meter power
       decode: int32s
+  energy:
+    source: modbus
+    {{- include "modbus" . | indent 2 }}
+    register:
+      address: 5098 # Total import energy
+      type: input
+      decode: uint32s
+    scale: 0.1
   {{- end }}
   {{- if eq .usage "pv" }}
   power:
     source: modbus
     {{- include "modbus" . | indent 2 }}
     register:
-      address: 5016 # Total DC power
+      address: 5030 # Total Active Power
       type: input
       decode: uint32s
+  energy:
+    source: modbus
+    {{- include "modbus" . | indent 2 }}
+    register:
+      address: 5003 # Total power yields
+      type: input
+      decode: uint32s
+    scale: 0.1
   {{- end }}
diff --git a/templates/docs/meter/sungrow-hybrid_0.yaml b/templates/docs/meter/sungrow-hybrid_0.yaml
index da3d3d727..844e1790d 100644
--- a/templates/docs/meter/sungrow-hybrid_0.yaml
+++ b/templates/docs/meter/sungrow-hybrid_0.yaml
@@ -1,6 +1,6 @@
 product:
   brand: Sungrow
-  description: Hybrid Inverter
+  description: SH Series Hybrid Inverter
 description: |
   Die Verbindung ist nur seriell (RS485) oder TCP (mit dem WiNet-S-Dongle) möglich.
 render:
diff --git a/templates/docs/meter/sungrow-inverter_0.yaml b/templates/docs/meter/sungrow-inverter_0.yaml
index b1ba051c3..410e123e6 100644
--- a/templates/docs/meter/sungrow-inverter_0.yaml
+++ b/templates/docs/meter/sungrow-inverter_0.yaml
@@ -1,6 +1,6 @@
 product:
   brand: Sungrow
-  description: Inverter
+  description: SG Series Inverter
 description: |
   Die Verbindung ist nur seriell (RS485) oder TCP (mit dem WiNet-S-Dongle) möglich.
 render: