Skip to content

Commit

Permalink
Amperfied: add phase getter (#16639)
Browse files Browse the repository at this point in the history
  • Loading branch information
andig authored Oct 13, 2024
1 parent 16c467a commit ccade7c
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 4 deletions.
17 changes: 15 additions & 2 deletions charger/amperfied.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,15 @@ const (
ampRegAmpsConfig = 261 // Holding
ampRegFailSafeConfig = 262 // Holding
ampRegPhaseSwitchControl = 501 // Holding
ampRegPhaseSwitchState = 5001 // Input
ampRegRfidUID = 2002 // Input
)

func init() {
registry.Add("amperfied", NewAmperfiedFromConfig)
}

//go:generate go run ../cmd/tools/decorate.go -f decorateAmperfied -b *Amperfied -r api.Charger -t "api.PhaseSwitcher,Phases1p3p,func(int) error"
//go:generate go run ../cmd/tools/decorate.go -f decorateAmperfied -b *Amperfied -r api.Charger -t "api.PhaseSwitcher,Phases1p3p,func(int) error" -t "api.PhaseGetter,GetPhases,func() (int, error)"

// NewAmperfiedFromConfig creates a Amperfied charger from generic config
func NewAmperfiedFromConfig(other map[string]interface{}) (api.Charger, error) {
Expand Down Expand Up @@ -106,11 +107,13 @@ func NewAmperfied(uri string, slaveID uint8, phases bool) (api.Charger, error) {
}

var phases1p3p func(int) error
var phasesG func() (int, error)
if phases {
phases1p3p = wb.phases1p3p
phasesG = wb.getPhases
}

return decorateAmperfied(wb, phases1p3p), nil
return decorateAmperfied(wb, phases1p3p, phasesG), nil
}

func (wb *Amperfied) heartbeat(timeout time.Duration) {
Expand Down Expand Up @@ -343,3 +346,13 @@ func (wb *Amperfied) phases1p3p(phases int) error {
_, err := wb.conn.WriteMultipleRegisters(ampRegPhaseSwitchControl, 1, b)
return err
}

// getPhases implements the api.PhaseGetter interface
func (wb *Amperfied) getPhases() (int, error) {
b, err := wb.conn.ReadInputRegisters(ampRegPhaseSwitchState, 1)
if err != nil {
return 0, err
}

return int(binary.BigEndian.Uint16(b)), nil
}
27 changes: 25 additions & 2 deletions charger/amperfied_decorators.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit ccade7c

Please sign in to comment.