EVSEWifi: add identifier api (#1168)

evcc-io · Jun 22, 2021 · 52e2bcb · 52e2bcb
1 parent c891477
commit 52e2bcb
Show file tree

Hide file tree

Showing 2 changed files with 344 additions and 19 deletions.
diff --git a/charger/evsewifi.go b/charger/evsewifi.go
@@ -44,6 +44,7 @@ type EVSEListEntry struct {
 	CurrentP1       float64 `json:"currentP1"`
 	CurrentP2       float64 `json:"currentP2"`
 	CurrentP3       float64 `json:"currentP3"`
+	RFIDUID         *string `json:"RFIDUID"`
 }
 
 // EVSEWifi charger implementation
@@ -60,7 +61,7 @@ func init() {
 	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.MeterCurrent,Currents,func() (float64, float64, float64, error)" -t "api.ChargerEx,MaxCurrentMillis,func(current float64) 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.MeterCurrent,Currents,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) {
@@ -121,7 +122,13 @@ func NewEVSEWifiFromConfig(other map[string]interface{}) (api.Charger, error) {
 		evse.current = 100 * evse.current
 	}
 
-	return decorateEVSE(evse, currentPower, totalEnergy, currents, maxCurrentEx), nil
+	// decorate Charger with Identifier
+	var identify func() (string, error)
+	if params.RFIDUID != nil {
+		identify = evse.identify
+	}
+
+	return decorateEVSE(evse, currentPower, totalEnergy, currents, maxCurrentEx, identify), nil
 }
 
 // NewEVSEWifi creates EVSEWifi charger
@@ -259,6 +266,12 @@ func (evse *EVSEWifi) currents() (float64, float64, float64, error) {
 	return float64(params.CurrentP1), float64(params.CurrentP2), float64(params.CurrentP3), err
 }
 
+// Identify implements the api.Identifier interface
+func (evse *EVSEWifi) identify() (string, error) {
+	params, err := evse.getParameters()
+	return *params.RFIDUID, err
+}
+
 // // ChargedEnergy implements the ChargeRater interface
 // func (evse *EVSEWifi) ChargedEnergy() (float64, error) {
 // 	params, err := evse.getParameters()