From 760fd0ccbc3ede4a46528c6d1030837aa56da6fc Mon Sep 17 00:00:00 2001
From: Maschga <88616799+Maschga@users.noreply.github.com>
Date: Sun, 18 May 2025 13:46:23 +0200
Subject: [PATCH] RCT: make S0ExternalPowerW configurable (BC) (#21234)

---
 meter/rct.go                              | 27 ++++++++++++++---------
 templates/definition/meter/rct-power.yaml | 10 +++++++++
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/meter/rct.go b/meter/rct.go
index 3235094c7..ca47b11bc 100644
--- a/meter/rct.go
+++ b/meter/rct.go
@@ -19,8 +19,9 @@ import (
 
 // RCT implements the api.Meter interface
 type RCT struct {
-	conn  *rct.Connection // connection with the RCT device
-	usage string          // grid, pv, battery
+	conn          *rct.Connection // connection with the RCT device
+	usage         string          // grid, pv, battery
+	externalPower bool            // whether to query external power
 }
 
 var (
@@ -42,6 +43,7 @@ func NewRCTFromConfig(ctx context.Context, other map[string]interface{}) (api.Me
 		MinSoc, MaxSoc int
 		MaxChargePower int
 		Cache          time.Duration
+		ExternalPower  bool
 	}{
 		MaxChargePower: 10000,
 		Cache:          30 * time.Second,
@@ -55,11 +57,11 @@ func NewRCTFromConfig(ctx context.Context, other map[string]interface{}) (api.Me
 		return nil, errors.New("missing usage")
 	}
 
-	return NewRCT(ctx, cc.Uri, cc.Usage, cc.MinSoc, cc.MaxSoc, cc.MaxChargePower, cc.Cache, cc.capacity.Decorator())
+	return NewRCT(ctx, cc.Uri, cc.Usage, cc.MinSoc, cc.MaxSoc, cc.MaxChargePower, cc.Cache, cc.ExternalPower, cc.capacity.Decorator())
 }
 
 // NewRCT creates an RCT meter
-func NewRCT(ctx context.Context, uri, usage string, minSoc, maxSoc, maxchargepower int, cache time.Duration, capacity func() float64) (api.Meter, error) {
+func NewRCT(ctx context.Context, uri, usage string, minSoc, maxSoc, maxchargepower int, cache time.Duration, externalPower bool, capacity func() float64) (api.Meter, error) {
 	log := util.NewLogger("rct")
 
 	// re-use connections
@@ -82,8 +84,9 @@ func NewRCT(ctx context.Context, uri, usage string, minSoc, maxSoc, maxchargepow
 	rctMu.Unlock()
 
 	m := &RCT{
-		usage: strings.ToLower(usage),
-		conn:  conn,
+		usage:         strings.ToLower(usage),
+		conn:          conn,
+		externalPower: externalPower,
 	}
 
 	// decorate api.MeterEnergy
@@ -178,11 +181,13 @@ func (m *RCT) CurrentPower() (float64, error) {
 			return err
 		})
 
-		eg.Go(func() error {
-			var err error
-			c, err = m.queryFloat(rct.S0ExternalPowerW)
-			return err
-		})
+		if m.externalPower {
+			eg.Go(func() error {
+				var err error
+				c, err = m.queryFloat(rct.S0ExternalPowerW)
+				return err
+			})
+		}
 
 		err := eg.Wait()
 		return a + b + c, err
diff --git a/templates/definition/meter/rct-power.yaml b/templates/definition/meter/rct-power.yaml
index 66b5421aa..6c1a70704 100644
--- a/templates/definition/meter/rct-power.yaml
+++ b/templates/definition/meter/rct-power.yaml
@@ -24,6 +24,15 @@ params:
     advanced: true
     default: 30s
   - name: maxchargepower
+  - name: externalpower
+    type: bool
+    description:
+      de: Externe Leistung
+      en: External power
+    help:
+      de: Externe Leistung aller an S0 angeschlossenen Geräte abfragen
+      en: Query external power of all devices connected to S0
+    advanced: true
 render: |
   type: rct
   uri: {{ .host }}
@@ -33,3 +42,4 @@ render: |
   minsoc: {{ .minsoc }}
   maxsoc: {{ .maxsoc }}
   maxchargepower: {{ .maxchargepower }}
+  externalpower: {{ .externalpower }}