Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Amperfied: add phase getter #16639

Merged
merged 1 commit into from
Oct 13, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
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.