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

Add evse power reading (#327)

Browse source
This commit is contained in:
andig 2020-09-01 14:06:20 +02:00 • committed by GitHub
parent 2bdec133c5
commit 71e72c7182
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 87 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
charger/evsewifi.go
View file

@ -54,7 +54,7 @@ func init() {
registry.Add("evsewifi", NewEVSEWifiFromConfig)
}
//go:generate go run ../cmd/tools/decorate.go -p charger -f decorateEVSE -b api.Charger -o evsewifi_decorators -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.MeterCurrent,Currents,func() (float64, float64, float64, error)"
//go:generate go run ../cmd/tools/decorate.go -p charger -f decorateEVSE -b api.Charger -o evsewifi_decorators -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.MeterCurrent,Currents,func() (float64, float64, float64, error)"
// NewEVSEWifiFromConfig creates a EVSEWifi charger from generic config
func NewEVSEWifiFromConfig(other map[string]interface{}) (api.Charger, error) {
@ -73,6 +73,12 @@ func NewEVSEWifiFromConfig(other map[string]interface{}) (api.Charger, error) {
return evse, err
}
// decorate Charger with Meter
var currentPower func() (float64, error)
if cc.Meter.Energy {
currentPower = evse.currentPower
}
// decorate Charger with MeterEnergy
var totalEnergy func() (float64, error)
if cc.Meter.Energy {
@ -85,7 +91,7 @@ func NewEVSEWifiFromConfig(other map[string]interface{}) (api.Charger, error) {
currents = evse.currents
}
return decorateEVSE(evse, totalEnergy, currents), nil
return decorateEVSE(evse, currentPower, totalEnergy, currents), nil
}
// NewEVSEWifi creates EVSEWifi charger
@ -187,6 +193,12 @@ func (evse *EVSEWifi) ChargingTime() (time.Duration, error) {
return time.Duration(params.Duration) * time.Millisecond, err
}
// CurrentPower implements the Meter interface
func (evse *EVSEWifi) currentPower() (float64, error) {
params, err := evse.getParameters()
return 1000 * params.ActualPower, err
}
// TotalEnergy implements the MeterEnergy interface
func (evse *EVSEWifi) totalEnergy() (float64, error) {
params, err := evse.getParameters()

78
charger/evsewifi_decorators.go
View file

@ -6,12 +6,23 @@ import (
"github.com/andig/evcc/api"
)
func decorateEVSE(base api.Charger, meterEnergy func() (float64, error), meterCurrent func() (float64, float64, float64, error)) api.Charger {
func decorateEVSE(base api.Charger, meter func() (float64, error), meterEnergy func() (float64, error), meterCurrent func() (float64, float64, float64, error)) api.Charger {
switch {
case meterCurrent == nil && meterEnergy == nil:
case meter == nil && meterCurrent == nil && meterEnergy == nil:
return base
case meterCurrent == nil && meterEnergy != nil:
case meter != nil && meterCurrent == nil && meterEnergy == nil:
return &struct{
api.Charger
api.Meter
}{
Charger: base,
Meter: &decorateEVSEMeterImpl{
meter: meter,
},
}
case meter == nil && meterCurrent == nil && meterEnergy != nil:
return &struct{
api.Charger
api.MeterEnergy
@ -22,7 +33,22 @@ func decorateEVSE(base api.Charger, meterEnergy func() (float64, error), meterCu
},
}
case meterCurrent != nil && meterEnergy == nil:
case meter != nil && meterCurrent == nil && meterEnergy != nil:
return &struct{
api.Charger
api.Meter
api.MeterEnergy
}{
Charger: base,
Meter: &decorateEVSEMeterImpl{
meter: meter,
},
MeterEnergy: &decorateEVSEMeterEnergyImpl{
meterEnergy: meterEnergy,
},
}
case meter == nil && meterCurrent != nil && meterEnergy == nil:
return &struct{
api.Charger
api.MeterCurrent
@ -33,7 +59,22 @@ func decorateEVSE(base api.Charger, meterEnergy func() (float64, error), meterCu
},
}
case meterCurrent != nil && meterEnergy != nil:
case meter != nil && meterCurrent != nil && meterEnergy == nil:
return &struct{
api.Charger
api.Meter
api.MeterCurrent
}{
Charger: base,
Meter: &decorateEVSEMeterImpl{
meter: meter,
},
MeterCurrent: &decorateEVSEMeterCurrentImpl{
meterCurrent: meterCurrent,
},
}
case meter == nil && meterCurrent != nil && meterEnergy != nil:
return &struct{
api.Charger
api.MeterCurrent
@ -47,11 +88,38 @@ func decorateEVSE(base api.Charger, meterEnergy func() (float64, error), meterCu
meterEnergy: meterEnergy,
},
}
case meter != nil && meterCurrent != nil && meterEnergy != nil:
return &struct{
api.Charger
api.Meter
api.MeterCurrent
api.MeterEnergy
}{
Charger: base,
Meter: &decorateEVSEMeterImpl{
meter: meter,
},
MeterCurrent: &decorateEVSEMeterCurrentImpl{
meterCurrent: meterCurrent,
},
MeterEnergy: &decorateEVSEMeterEnergyImpl{
meterEnergy: meterEnergy,
},
}
}
return nil
}
type decorateEVSEMeterImpl struct {
meter func() (float64, error)
}
func (impl *decorateEVSEMeterImpl) CurrentPower() (float64, error) {
return impl.meter()
}
type decorateEVSEMeterCurrentImpl struct {
meterCurrent func() (float64, float64, float64, error)
}