From 8a080601f619b92a394a1cf1f4afa7690b5859f7 Mon Sep 17 00:00:00 2001 From: Markus Kaindl Date: Tue, 24 Feb 2026 22:04:09 +0100 Subject: [PATCH 1/4] openWB SW2.0: RFID currently broken --- templates/definition/charger/openwb-2.0.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/templates/definition/charger/openwb-2.0.yaml b/templates/definition/charger/openwb-2.0.yaml index 779872554d9..d3b30ba55c1 100644 --- a/templates/definition/charger/openwb-2.0.yaml +++ b/templates/definition/charger/openwb-2.0.yaml @@ -3,7 +3,7 @@ products: - brand: openWB description: generic: Software 2.x -capabilities: ["1p3p", "mA", "rfid"] +capabilities: ["1p3p", "mA"] requirements: description: de: | @@ -12,12 +12,18 @@ requirements: * Steuerungsmodus: `secondary` * Steuerung über Modbus als secondary: `An` + + RFID-Autorisierung ist mit openWB Software 2.x leider aktuell nicht sinnvoll nutzbar, siehe + [`Issue 2832`](https://github.com/openWB/core/issues/2832) en: | Requires [`Software 2.x`](https://github.com/openWB/core). The following changes are necessary under the 'Einstellungen' tab: * Steuerungsmodus: `secondary` * Steuerung über Modbus als secondary: `An` + + RFID-Authorisation currently is not usable with openWB Software 2.x, check + [`openWB Issue 2832`](https://github.com/openWB/core/issues/2832) params: - name: modbus choice: ["tcpip"] From 7d3520e226df4f34f7051b8b4731934a9d4069b4 Mon Sep 17 00:00:00 2001 From: Markus Kaindl Date: Wed, 22 Apr 2026 23:54:21 +0200 Subject: [PATCH 2/4] openWB SW2.0: Make RFID an option which is disabled by default --- charger/openwb-2.0.go | 8 ++++++-- templates/definition/charger/openwb-2.0.yaml | 11 +++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/charger/openwb-2.0.go b/charger/openwb-2.0.go index 7a372cc9bdd..2abefec48ad 100644 --- a/charger/openwb-2.0.go +++ b/charger/openwb-2.0.go @@ -48,12 +48,14 @@ func NewOpenWB20FromConfig(ctx context.Context, other map[string]any) (api.Charg cc := struct { Connector uint16 Phases1p3p bool + Identify bool modbus.TcpSettings `mapstructure:",squash"` }{ Connector: 1, TcpSettings: modbus.TcpSettings{ ID: 1, }, + Identify: false, } if err := util.DecodeOther(other, &cc); err != nil { @@ -71,8 +73,10 @@ func NewOpenWB20FromConfig(ctx context.Context, other map[string]any) (api.Charg } var identify func() (string, error) - if _, err := wb.identify(); err == nil { - identify = wb.identify + if cc.Identify { + if _, err := wb.identify(); err == nil { + identify = wb.identify + } } return decorateOpenWB20(wb, phases1p3p, identify), nil diff --git a/templates/definition/charger/openwb-2.0.yaml b/templates/definition/charger/openwb-2.0.yaml index d3b30ba55c1..916f3544f92 100644 --- a/templates/definition/charger/openwb-2.0.yaml +++ b/templates/definition/charger/openwb-2.0.yaml @@ -38,8 +38,19 @@ params: de: Phasenumschaltung vorhanden advanced: true default: true + - name: identify + type: bool + description: + en: Use RFID-Reader + de: RFID-Reader verwenden + help: + en: Be sure to check openWB Issue 2832 before enabling this, should not be used for access protection! + de: Unbedingt openWB Issue 2832 beachten, sollte nicht für Zugangsschutz verwendet werden! + advanced: true + default: false render: | type: openwb-2.0 {{- include "modbus" . }} connector: {{ .connector }} phases1p3p: {{ .phases1p3p }} + identify: {{ .identify }} From d960ced9e97e9254b5de72eb2a218145834f0e84 Mon Sep 17 00:00:00 2001 From: Markus Kaindl Date: Mon, 27 Apr 2026 23:13:04 +0200 Subject: [PATCH 3/4] removed unnecessary defaults (review by andig) --- charger/openwb-2.0.go | 1 - templates/definition/charger/openwb-2.0.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/charger/openwb-2.0.go b/charger/openwb-2.0.go index 2abefec48ad..2494e86fbc2 100644 --- a/charger/openwb-2.0.go +++ b/charger/openwb-2.0.go @@ -55,7 +55,6 @@ func NewOpenWB20FromConfig(ctx context.Context, other map[string]any) (api.Charg TcpSettings: modbus.TcpSettings{ ID: 1, }, - Identify: false, } if err := util.DecodeOther(other, &cc); err != nil { diff --git a/templates/definition/charger/openwb-2.0.yaml b/templates/definition/charger/openwb-2.0.yaml index 916f3544f92..49903133676 100644 --- a/templates/definition/charger/openwb-2.0.yaml +++ b/templates/definition/charger/openwb-2.0.yaml @@ -47,7 +47,6 @@ params: en: Be sure to check openWB Issue 2832 before enabling this, should not be used for access protection! de: Unbedingt openWB Issue 2832 beachten, sollte nicht für Zugangsschutz verwendet werden! advanced: true - default: false render: | type: openwb-2.0 {{- include "modbus" . }} From 9b7a6f4483995a6443d73047f02953ac264969c1 Mon Sep 17 00:00:00 2001 From: Markus Kaindl Date: Wed, 29 Apr 2026 23:04:03 +0200 Subject: [PATCH 4/4] fixed missing error handling --- charger/openwb-2.0.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/charger/openwb-2.0.go b/charger/openwb-2.0.go index 2494e86fbc2..5c488e9f23d 100644 --- a/charger/openwb-2.0.go +++ b/charger/openwb-2.0.go @@ -73,8 +73,11 @@ func NewOpenWB20FromConfig(ctx context.Context, other map[string]any) (api.Charg var identify func() (string, error) if cc.Identify { - if _, err := wb.identify(); err == nil { + _, err := wb.identify() + if err == nil { identify = wb.identify + } else { + return nil, err } }