From 54162f06aab83c043bb822945fd0d500069355f6 Mon Sep 17 00:00:00 2001 From: andig Date: Sat, 3 May 2025 09:11:34 +0200 Subject: [PATCH] SGReady: use standardised modes (BC) (#20747) --- charger/sgready.go | 12 ++++++------ templates/definition/charger/emsesp.yaml | 12 ++++++------ templates/definition/charger/stiebel-lwa.yaml | 14 +++++++------- templates/definition/charger/stiebel-wpm.yaml | 14 +++++++------- templates/definition/charger/weishaupt-wpm.yaml | 6 +++--- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/charger/sgready.go b/charger/sgready.go index 653dc9c19..5069211c9 100644 --- a/charger/sgready.go +++ b/charger/sgready.go @@ -40,10 +40,10 @@ func init() { } const ( - _ int64 = iota - Normal - Boost - Stop + _ int64 = iota + Dimm // 1 + Normal // 2 + Boost // 3 ) //go:generate go tool decorate -f decorateSgReady -b *SgReady -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.Battery,Soc,func() (float64, error)" -t "api.SocLimiter,GetLimitSoc,func() (int64, error)" @@ -123,8 +123,8 @@ func (wb *SgReady) Status() (api.ChargeStatus, error) { return api.StatusNone, err } - if mode == Stop { - return api.StatusNone, errors.New("stop mode") + if mode == Dimm { + return api.StatusNone, errors.New("dimm mode") } status := map[int64]api.ChargeStatus{Boost: api.StatusC, Normal: api.StatusB} diff --git a/templates/definition/charger/emsesp.yaml b/templates/definition/charger/emsesp.yaml index ac8b35fd9..ea750682a 100644 --- a/templates/definition/charger/emsesp.yaml +++ b/templates/definition/charger/emsesp.yaml @@ -43,10 +43,10 @@ render: | getmode: source: go script: | - res := 1 // 0/0 Normal + res := 2 // 0/0 Normal switch { - case SG1 == "1" && SG4 == "0": res = 3 // 1/0 Frostschutz - case SG4 == "1": res = 2 // x/1 Forcierter Betrieb/Sofortige Ansteuerung + case SG1 == "1" && SG4 == "0": res = 1 // 1/0 Frostschutz + case SG4 == "1": res = 3 // x/1 Forcierter Betrieb/Sofortige Ansteuerung } res in: @@ -65,7 +65,7 @@ render: | setmode: source: switch switch: - - case: 1 # normal + - case: 2 # normal set: source: sequence set: @@ -85,7 +85,7 @@ render: | - authorization: Bearer {{ .token}} body: > { "value" : "0xxxxxxxxxxxxxx" } - - case: 2 # boost + - case: 3 # boost set: source: http uri: http://{{ .host }}/api/boiler/hpin4opt @@ -95,7 +95,7 @@ render: | - authorization: Bearer {{ .token}} body: > { "value" : "1xxxxxxxxxxx" } - - case: 3 # dimm + - case: 1 # dimm set: source: sequence set: diff --git a/templates/definition/charger/stiebel-lwa.yaml b/templates/definition/charger/stiebel-lwa.yaml index 3c62528e9..be3e5c7ed 100644 --- a/templates/definition/charger/stiebel-lwa.yaml +++ b/templates/definition/charger/stiebel-lwa.yaml @@ -23,10 +23,10 @@ render: | getmode: source: map values: - 1: 3 # Frostschutz - 2: 1 # Normal - 3: 2 # Forcierter Betrieb - 4: 2 # Sofortige Ansteuerung + 1: 1 # Frostschutz + 2: 2 # Normal + 3: 3 # Forcierter Betrieb + 4: 3 # Sofortige Ansteuerung get: source: modbus {{- include "modbus" . | indent 4 }} @@ -37,7 +37,7 @@ render: | setmode: source: switch switch: - - case: 1 # normal + - case: 2 # normal set: source: sequence set: @@ -59,7 +59,7 @@ render: | address: 4002 type: writesingle encoding: uint16 - - case: 2 # boost + - case: 3 # boost set: source: sequence set: @@ -81,7 +81,7 @@ render: | address: 4002 type: writesingle encoding: uint16 - - case: 3 # dimm + - case: 1 # dimm set: source: sequence set: diff --git a/templates/definition/charger/stiebel-wpm.yaml b/templates/definition/charger/stiebel-wpm.yaml index 484524add..86c333455 100644 --- a/templates/definition/charger/stiebel-wpm.yaml +++ b/templates/definition/charger/stiebel-wpm.yaml @@ -20,10 +20,10 @@ render: | getmode: source: map values: - 1: 3 # Frostschutz - 2: 1 # Normal - 3: 2 # Forcierter Betrieb - 4: 2 # Sofortige Ansteuerung + 1: 1 # Frostschutz + 2: 2 # Normal + 3: 3 # Forcierter Betrieb + 4: 3 # Sofortige Ansteuerung get: source: modbus {{- include "modbus" . | indent 4 }} @@ -34,7 +34,7 @@ render: | setmode: source: switch switch: - - case: 1 # normal + - case: 2 # normal set: source: sequence set: @@ -56,7 +56,7 @@ render: | address: 4002 type: writesingle encoding: uint16 - - case: 2 # boost + - case: 3 # boost set: source: sequence set: @@ -78,7 +78,7 @@ render: | address: 4002 type: writesingle encoding: uint16 - - case: 3 # dimm + - case: 1 # dimm set: source: sequence set: diff --git a/templates/definition/charger/weishaupt-wpm.yaml b/templates/definition/charger/weishaupt-wpm.yaml index 843062c31..ea93c002f 100644 --- a/templates/definition/charger/weishaupt-wpm.yaml +++ b/templates/definition/charger/weishaupt-wpm.yaml @@ -21,10 +21,10 @@ render: | getmode: source: go script: | - res := 1 + res := 2 // 0/0 Normal switch { - case SG1 == 1 && SG2 == 0: res = 3 - case SG2 == 1: res = 2 + case SG1 == 1 && SG2 == 0: res = 1 // 1/0 Frostschutz + case SG2 == 1: res = 3 // x/1 Forcierter Betrieb/Sofortige Ansteuerung } res in: