Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@weblate
weblate committed Aug 25, 2023
2 parents 482ac01 + dc3e83e commit 72cdfd2
Show file tree
Hide file tree
Showing 5 changed files with 802 additions and 103 deletions.
3 changes: 3 additions & 0 deletions charger/evse/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,8 @@ type ListEntry struct {
CurrentP1 float64 `json:"currentP1"`
CurrentP2 float64 `json:"currentP2"`
CurrentP3 float64 `json:"currentP3"`
VoltageP1 float64 `json:"voltageP1"`
VoltageP2 float64 `json:"voltageP2"`
VoltageP3 float64 `json:"voltageP3"`
RFIDUID *string `json:"RFIDUID"`
}
108 changes: 60 additions & 48 deletions charger/evsewifi.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (

"github.com/evcc-io/evcc/api"
"github.com/evcc-io/evcc/charger/evse"
"github.com/evcc-io/evcc/provider"
"github.com/evcc-io/evcc/util"
"github.com/evcc-io/evcc/util/request"
)
Expand All @@ -19,35 +20,39 @@ type EVSEWifi struct {
alwaysActive bool
current int64 // current will always be the physical value sent to the API
hires bool
paramG provider.Cacheable[evse.ListEntry]
}

func init() {
registry.Add("smartwb", NewEVSEWifiFromConfig)
registry.Add("evsewifi", NewEVSEWifiFromConfig)
}

// go:generate go run ../cmd/tools/decorate.go -f decorateEVSE -b *EVSEWifi -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)" -t "api.ChargerEx,MaxCurrentMillis,func(current float64) error" -t "api.Identifier,Identify,func() (string, error)"
// go:generate go run ../cmd/tools/decorate.go -f decorateEVSE -b *EVSEWifi -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)" -t "api.PhaseVoltages,Voltages,func() (float64, float64, float64, error)" -t "api.ChargerEx,MaxCurrentMillis,func(current float64) error" -t "api.Identifier,Identify,func() (string, error)"

// NewEVSEWifiFromConfig creates a EVSEWifi charger from generic config
func NewEVSEWifiFromConfig(other map[string]interface{}) (api.Charger, error) {
var cc struct {
cc := struct {
URI string
Meter struct {
Power, Energy, Currents bool
Power, Energy, Currents, Voltages bool
}
Cache time.Duration
}{
Cache: time.Second,
}

if err := util.DecodeOther(other, &cc); err != nil {
return nil, err
}

wb, err := NewEVSEWifi(util.DefaultScheme(cc.URI, "http"))
wb, err := NewEVSEWifi(util.DefaultScheme(cc.URI, "http"), cc.Cache)
if err != nil {
return wb, err
}

// auto-detect capabilities
params, err := wb.getParameters()
params, err := wb.paramG.Get()
if err != nil {
return wb, err
}
Expand All @@ -57,9 +62,10 @@ func NewEVSEWifiFromConfig(other map[string]interface{}) (api.Charger, error) {
}

if params.UseMeter {
cc.Meter.Energy = true
cc.Meter.Power = true
cc.Meter.Energy = true
cc.Meter.Currents = true
cc.Meter.Voltages = true
}

if params.ActualCurrentMA != nil {
Expand All @@ -68,7 +74,7 @@ func NewEVSEWifiFromConfig(other map[string]interface{}) (api.Charger, error) {

// decorate Charger with Meter
var currentPower func() (float64, error)
if cc.Meter.Energy {
if cc.Meter.Power {
currentPower = wb.currentPower
}

Expand All @@ -84,6 +90,12 @@ func NewEVSEWifiFromConfig(other map[string]interface{}) (api.Charger, error) {
currents = wb.currents
}

// decorate Charger with PhaseVoltages
var voltages func() (float64, float64, float64, error)
if cc.Meter.Voltages {
voltages = wb.voltages
}

// decorate Charger with MaxCurrentEx
var maxCurrentEx func(float64) error
if wb.hires {
Expand All @@ -97,11 +109,11 @@ func NewEVSEWifiFromConfig(other map[string]interface{}) (api.Charger, error) {
identify = wb.identify
}

return decorateEVSE(wb, currentPower, totalEnergy, currents, maxCurrentEx, identify), nil
return decorateEVSE(wb, currentPower, totalEnergy, currents, voltages, maxCurrentEx, identify), nil
}

// NewEVSEWifi creates EVSEWifi charger
func NewEVSEWifi(uri string) (*EVSEWifi, error) {
func NewEVSEWifi(uri string, cache time.Duration) (*EVSEWifi, error) {
log := util.NewLogger("evse")

wb := &EVSEWifi{
Expand All @@ -110,31 +122,27 @@ func NewEVSEWifi(uri string) (*EVSEWifi, error) {
current: 6, // 6A defined value
}

return wb, nil
}

// query evse parameters
func (wb *EVSEWifi) getParameters() (evse.ListEntry, error) {
var res evse.ParameterResponse
uri := fmt.Sprintf("%s/getParameters", wb.uri)
err := wb.GetJSON(uri, &res)
if err != nil {
return evse.ListEntry{}, err
}
wb.paramG = provider.ResettableCached(func() (evse.ListEntry, error) {
var res evse.ParameterResponse
uri := fmt.Sprintf("%s/getParameters", wb.uri)
if err := wb.GetJSON(uri, &res); err != nil {
return evse.ListEntry{}, err
}

if len(res.List) != 1 {
return evse.ListEntry{}, fmt.Errorf("unexpected response: %s", res.Type)
}
if len(res.List) != 1 {
return evse.ListEntry{}, fmt.Errorf("unexpected response: %s", res.Type)
}
wb.alwaysActive = res.List[0].AlwaysActive

params := res.List[0]
wb.alwaysActive = params.AlwaysActive
return res.List[0], nil
}, cache)

return params, nil
return wb, nil
}

// Status implements the api.Charger interface
func (wb *EVSEWifi) Status() (api.ChargeStatus, error) {
params, err := wb.getParameters()
params, err := wb.paramG.Get()
if err != nil {
return api.StatusNone, err
}
Expand All @@ -157,7 +165,7 @@ func (wb *EVSEWifi) Status() (api.ChargeStatus, error) {

// Enabled implements the api.Charger interface
func (wb *EVSEWifi) Enabled() (bool, error) {
params, err := wb.getParameters()
params, err := wb.paramG.Get()
return params.EvseState, err
}

Expand All @@ -180,7 +188,13 @@ func (wb *EVSEWifi) Enable(enable bool) error {
}
uri = fmt.Sprintf("%s/setCurrent?current=%d", wb.uri, current)
}
return wb.get(uri)

err := wb.get(uri)
if err == nil {
wb.paramG.Reset()
}

return err
}

// MaxCurrent implements the api.Charger interface
Expand All @@ -190,7 +204,13 @@ func (wb *EVSEWifi) MaxCurrent(current int64) error {
}
wb.current = current
uri := fmt.Sprintf("%s/setCurrent?current=%d", wb.uri, current)
return wb.get(uri)

err := wb.get(uri)
if err == nil {
wb.paramG.Reset()
}

return err
}

// maxCurrentEx implements the api.ChargerEx interface
Expand All @@ -200,35 +220,33 @@ func (wb *EVSEWifi) maxCurrentEx(current float64) error {
return wb.get(uri)
}

var _ api.ChargeTimer = (*EVSEWifi)(nil)

// ChargingTime implements the api.ChargeTimer interface
func (wb *EVSEWifi) ChargingTime() (time.Duration, error) {
params, err := wb.getParameters()
return time.Duration(params.Duration) * time.Millisecond, err
}

// CurrentPower implements the api.Meter interface
func (wb *EVSEWifi) currentPower() (float64, error) {
params, err := wb.getParameters()
params, err := wb.paramG.Get()
return 1000 * params.ActualPower, err
}

// TotalEnergy implements the api.MeterEnergy interface
func (wb *EVSEWifi) totalEnergy() (float64, error) {
params, err := wb.getParameters()
params, err := wb.paramG.Get()
return params.MeterReading, err
}

// Currents implements the api.PhaseCurrentss interface
func (wb *EVSEWifi) currents() (float64, float64, float64, error) {
params, err := wb.getParameters()
params, err := wb.paramG.Get()
return params.CurrentP1, params.CurrentP2, params.CurrentP3, err
}

// Voltages implements the api.PhaseCurrentss interface
func (wb *EVSEWifi) voltages() (float64, float64, float64, error) {
params, err := wb.paramG.Get()
return params.VoltageP1, params.VoltageP2, params.VoltageP3, err
}

// Identify implements the api.Identifier interface
func (wb *EVSEWifi) identify() (string, error) {
params, err := wb.getParameters()
params, err := wb.paramG.Get()
if err != nil {
return "", err
}
Expand All @@ -237,12 +255,6 @@ func (wb *EVSEWifi) identify() (string, error) {
return *params.RFIDUID, nil
}

// // ChargedEnergy implements the ChargeRater interface
// func (wb *EVSEWifi) ChargedEnergy() (float64, error) {
// params, err := wb.getParameters()
// return params.Energy, err
// }

var _ api.Resurrector = (*EVSEWifi)(nil)

// WakeUp implements the Resurrector interface
Expand Down
Loading

0 comments on commit 72cdfd2

Please sign in to comment.