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

Fix OpenWB build

Browse source
This commit is contained in:
andig 2021-11-07 17:43:03 +01:00
parent ebf4baa431
commit 1104080057
1 changed files with 5 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

22
charger/openwb.go
View file

@ -21,8 +21,6 @@ type OpenWB struct {
currentPowerG func() (float64, error)
totalEnergyG func() (float64, error)
currentsG []func() (float64, error)
phasesS func(int64) error
socG func() (float64, error)
}
// go:generate go run ../cmd/tools/decorate.go -f decorateOpenWB -b *OpenWB -r api.Charger -t "api.ChargePhases,Phases1p3p,func(int) (error)" -t "api.Battery,SoC,func() (float64, error)"
@ -131,18 +129,18 @@ func NewOpenWB(log *util.Logger, mqttconf mqtt.Config, id int, topic string, p1p
var phases func(int) error
if p1p3 {
c.phasesS = provider.NewMqtt(log, client,
phasesS := provider.NewMqtt(log, client,
fmt.Sprintf("%s/set/isss/%s", topic, openwb.PhasesTopic),
1, timeout).IntSetter("phases")
phases = c.phases
phases = func(phases int) error {
return phasesS(int64(phases))
}
}
var soc func() (float64, error)
if dc {
c.socG = floatG(fmt.Sprintf("%s/lp/%d/%s", topic, id, openwb.VehicleSoCTopic))
soc = c.socG
soc = floatG(fmt.Sprintf("%s/lp/%d/%s", topic, id, openwb.VehicleSoCTopic))
}
return decorateOpenWB(c, phases, soc), nil
@ -178,13 +176,3 @@ func (m *OpenWB) Currents() (float64, float64, float64, error) {
return currents[0], currents[1], currents[2], nil
}
// phases implements the api.ChargePhases interface
func (c *OpenWB) phases(phases int) error {
return c.phasesS(int64(phases))
}
// soc implements the api.Battery interface
func (c *OpenWB) soc() (float64, error) {
return c.socG()
}