From 9f71025bd0a1f58d3a13373fdd08195ecfccf8b2 Mon Sep 17 00:00:00 2001
From: Thomas Speer <ts@vg-mediastudio.de>
Date: Wed, 8 Oct 2025 11:38:52 +0200
Subject: [PATCH] Discharge-Mode for goodwe-hybrid make selectable in yaml and
 ui

---
 i18n/de.json                                  |  4 ++++
 i18n/en.json                                  |  4 ++++
 templates/definition/meter/goodwe-hybrid.yaml | 14 +++++++++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/i18n/de.json b/i18n/de.json
index fa2e26ca1d..69d72fa7b7 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -409,6 +409,10 @@
         "no": "nein",
         "yes": "ja"
       },
+      "dischargemode": {
+        "2": "Charge-PV (PV für Batterieladung nutzen)",
+        "8": "Standby (Batterie im Leerlauf)"
+      },
       "endianness": {
         "big": "big-endian",
         "little": "little-endian"
diff --git a/i18n/en.json b/i18n/en.json
index ef599199b5..1b77f053cb 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -409,6 +409,10 @@
         "no": "no",
         "yes": "yes"
       },
+      "dischargemode": {
+        "2": "Charge-PV (use PV to charge battery)",
+        "8": "Standby (battery idle)"
+      },
       "endianness": {
         "big": "big-endian",
         "little": "little-endian"
diff --git a/templates/definition/meter/goodwe-hybrid.yaml b/templates/definition/meter/goodwe-hybrid.yaml
index f1d9013e85..df09d95f10 100644
--- a/templates/definition/meter/goodwe-hybrid.yaml
+++ b/templates/definition/meter/goodwe-hybrid.yaml
@@ -20,6 +20,18 @@ params:
     choice: [1, 2]
   - name: capacity
     advanced: true
+  - name: dischargemode
+    default: 2
+    type: choice
+    advanced: true
+    description:
+      en: Discharge hold mode (2=Charge-PV, 8=Standby)
+      de: Entladesperre-Modus (2=Charge-PV, 8=Standby)
+    help:
+      en: "Mode 2 (Charge-PV): Uses PV power to charge battery, uses grid power for AC loads. Mode 8 (Standby): Battery neither charges nor discharges."
+      de: "Modus 2 (Charge-PV): Nutzt PV-Strom für Batterieladung, Netzstrom für AC-Lasten. Modus 8 (Standby): Batterie lädt oder entlädt nicht."
+    choice: [2, 8]
+    usages: ["battery"]
   - name: maxacpower
 render: |
   type: custom
@@ -182,7 +194,7 @@ render: |
           source: sequence
           set:
           - source: const
-            value: 2 # EMSPowerMode 2 "Charge-PV"-Mode. If EMSPowerSet=0 only PV is used to charge. Value 6 "Conserve"-Mode can be alternatively used.
+            value: {{ .dischargemode }} # EMSPowerMode: 2="Charge-PV" (uses PV to charge, grid for AC loads) or 8="Standby" (battery standby, no charge/discharge)
             set:
               source: modbus
               {{- include "modbus" . | indent 12 }}