Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mennekes: check 1p3p hw option is installed (#18757)

Browse source
This commit is contained in:
premultiply 2025-02-16 21:23:13 +01:00 • committed by GitHub
parent 0b877c3422
commit 720048d93f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 46 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
charger/mennekes-compact.go
View file

@ -2,7 +2,7 @@ package charger
// LICENSE
// Copyright (c) 2023 premultiply
// Copyright (c) 2023-2025 premultiply
// This module is NOT covered by the MIT license. All rights reserved.
@ -87,6 +87,8 @@ func NewMennekesCompactFromConfig(ctx context.Context, other map[string]interfac
return NewMennekesCompact(ctx, cc.URI, cc.Device, cc.Comset, cc.Baudrate, cc.Settings.Protocol(), cc.ID, cc.Timeout)
}
//go:generate go tool decorate -f decorateMennekesCompact -b *MennekesCompact -r api.Charger -t "api.PhaseSwitcher,Phases1p3p,func(int) error"
// NewMennekesCompact creates Mennekes charger
func NewMennekesCompact(ctx context.Context, uri, device, comset string, baudrate int, proto modbus.Protocol, slaveID uint8, timeout time.Duration) (api.Charger, error) {
conn, err := modbus.NewConnection(uri, device, comset, baudrate, proto, slaveID)
@ -110,10 +112,16 @@ func NewMennekesCompact(ctx context.Context, uri, device, comset string, baudrat
conn: conn,
}
// check phase switching support
var phasesS func(int) error
if b, err := wb.conn.ReadHoldingRegisters(mennekesRegPhaseOptionsHW, 1); err == nil && encoding.Uint16(b) == 2 {
phasesS = wb.phases1p3p
}
// failsafe
go wb.heartbeat(ctx, mennekesHeartbeatInterval)
return wb, err
return decorateMennekesCompact(wb, phasesS), err
}
func (wb *MennekesCompact) heartbeat(ctx context.Context, timeout time.Duration) {
@ -265,10 +273,8 @@ func (wb *MennekesCompact) ChargeDuration() (time.Duration, error) {
}
*/
var _ api.PhaseSwitcher = (*MennekesCompact)(nil)
// Phases1p3p implements the api.PhaseSwitcher interface
func (wb *MennekesCompact) Phases1p3p(phases int) error {
func (wb *MennekesCompact) phases1p3p(phases int) error {
var u uint16
if phases == 1 {
u = 1

35
charger/mennekes-compact_decorators.go Normal file
View file

@ -0,0 +1,35 @@
package charger
// Code generated by github.com/evcc-io/evcc/cmd/tools/decorate.go. DO NOT EDIT.
import (
"github.com/evcc-io/evcc/api"
)
func decorateMennekesCompact(base *MennekesCompact, phaseSwitcher func(int) error) api.Charger {
switch {
case phaseSwitcher == nil:
return base
case phaseSwitcher != nil:
return &struct {
*MennekesCompact
api.PhaseSwitcher
}{
MennekesCompact: base,
PhaseSwitcher: &decorateMennekesCompactPhaseSwitcherImpl{
phaseSwitcher: phaseSwitcher,
},
}
}
return nil
}
type decorateMennekesCompactPhaseSwitcherImpl struct {
phaseSwitcher func(int) error
}
func (impl *decorateMennekesCompactPhaseSwitcherImpl) Phases1p3p(p0 int) error {
return impl.phaseSwitcher(p0)
}