From 4e72d7f93e8d4f3799b14a2ad79191e30d9deb68 Mon Sep 17 00:00:00 2001
From: rivengh <75251226+rivengh@users.noreply.github.com>
Date: Sat, 7 Sep 2024 19:57:11 +0200
Subject: [PATCH 1/2] sonnenbatterie: implement grid charging

---
 .../definition/meter/sonnenbatterie.yaml      | 44 ++++++++++++++-----
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/templates/definition/meter/sonnenbatterie.yaml b/templates/definition/meter/sonnenbatterie.yaml
index e0a2181175..4e1da0e7f1 100644
--- a/templates/definition/meter/sonnenbatterie.yaml
+++ b/templates/definition/meter/sonnenbatterie.yaml
@@ -9,10 +9,10 @@ requirements:
   description:
     de: |
       Für die aktive Batteriesteuerung muss über das Webinterface der sonnenBatterie (unter Software-Integration) das "JSON Write API" aktiviert und das dort generierte API-Token in der Batteriekonfiguration unter `token` eingetragen werden.
-      Netzladen ist nicht implementiert.
+      Die Leistung für das Netzladen kann an die Wechselrichterleistung der sonnenBatterie über den Parameter `chargepower` angepasst werden.
     en: |
       For active battery control, the "JSON Write API" must be activated via the sonnenBatterie web interface (under Software-Integration) and the API token generated there must be entered in the battery configuration under `token`.
-      Grid charging is not implemented.
+      The power for grid charging can be adapted to the inverter power of the sonnenBatterie via the `chargepower` parameter.
 params:
   - name: usage
     choice: ["grid", "pv", "battery"]
@@ -28,6 +28,14 @@ params:
       de: API Token (benötigt für aktive Batteriesteuerung)
       en: API Token (required for active battery control)
     usages: ["battery"]
+  - name: chargepower
+    default: 3300
+    advanced: true
+    required: false
+    help:
+      de: Ladeleistung für Netzladen in W
+      en: Charging power for grid charging in W
+    usages: ["battery"]
 render: |
   type: custom
   power:
@@ -88,14 +96,30 @@ render: |
           - Auth-Token: {{ .token }}
     - case: 3 # charge
       set:
-        source: http
-        uri: http://{{ .host }}/api/v2/configurations
-        insecure: true
-        method: PUT
-        headers:
-        - content-type: application/json
-        - Auth-Token: {{ .token }}
-        body: '{"EM_OperatingMode":"2"}'  # self consumption
+        source: sequence
+        set:
+        - source: http
+          uri: http://{{ .host }}/api/v2/configurations
+          insecure: true
+          method: PUT
+          headers:
+          - content-type: application/json
+          - Auth-Token: {{ .token }}
+          body: '{"EM_OperatingMode":"1"}'  # manual
+        - source: http
+          uri: http://{{ .host }}/api/v2/setpoint/discharge/0
+          insecure: true
+          method: POST
+          headers:
+          - content-type: application/json
+          - Auth-Token: {{ .token }}
+        - source: http
+          uri: http://{{ .host }}/api/v2/setpoint/charge/{{ .chargepower }}
+          insecure: true
+          method: POST
+          headers:
+          - content-type: application/json
+          - Auth-Token: {{ .token }}
   {{- end }}
   {{- if .capacity }}
   capacity: {{ .capacity }} # kWh

From 7d3f4d57172e31593e6161d7e2db4a8bc2d5f9b6 Mon Sep 17 00:00:00 2001
From: andig <cpuidle@gmail.com>
Date: Sun, 8 Sep 2024 14:10:01 +0200
Subject: [PATCH 2/2] Update templates/definition/meter/sonnenbatterie.yaml

---
 templates/definition/meter/sonnenbatterie.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/definition/meter/sonnenbatterie.yaml b/templates/definition/meter/sonnenbatterie.yaml
index 4e1da0e7f1..63e7bde7ea 100644
--- a/templates/definition/meter/sonnenbatterie.yaml
+++ b/templates/definition/meter/sonnenbatterie.yaml
@@ -31,7 +31,6 @@ params:
   - name: chargepower
     default: 3300
     advanced: true
-    required: false
     help:
       de: Ladeleistung für Netzladen in W
       en: Charging power for grid charging in W