Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions charger/openwb-2.0.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Comment thread
kaindl marked this conversation as resolved.
Outdated
}

if err := util.DecodeOther(other, &cc); err != nil {
Expand All @@ -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 {
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing error check

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

which error check are you expecting here?

Copy link
Copy Markdown
Member

@andig andig Apr 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

error needs be returned if != nil

identify = wb.identify
}
}

return decorateOpenWB20(wb, phases1p3p, identify), nil
Expand Down
19 changes: 18 additions & 1 deletion templates/definition/charger/openwb-2.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ products:
- brand: openWB
description:
generic: Software 2.x
capabilities: ["1p3p", "mA", "rfid"]
capabilities: ["1p3p", "mA"]
requirements:
description:
de: |
Expand All @@ -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"]
Expand All @@ -32,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
Comment thread
kaindl marked this conversation as resolved.
Outdated
render: |
type: openwb-2.0
{{- include "modbus" . }}
connector: {{ .connector }}
phases1p3p: {{ .phases1p3p }}
identify: {{ .identify }}
Loading