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

Cleanup vehicle detection

Browse source
This commit is contained in:
andig 2021-12-28 11:28:58 +01:00
parent 8ca523291f
commit 4c09be6553
12 changed files with 20 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

5
vehicle/audi.go
View file

@ -2,7 +2,6 @@ package vehicle
import (
"fmt"
"strings"
"time"
"github.com/evcc-io/evcc/api"
@ -60,8 +59,8 @@ func NewAudiFromConfig(other map[string]interface{}) (api.Vehicle, error) {
cc.VIN, err = ensureVehicle(cc.VIN, api.Vehicles)
if err == nil {
if err = api.HomeRegion(strings.ToUpper(cc.VIN)); err == nil {
v.Provider = vw.NewProvider(api, strings.ToUpper(cc.VIN), cc.Cache)
if err = api.HomeRegion(cc.VIN); err == nil {
v.Provider = vw.NewProvider(api, cc.VIN, cc.Cache)
}
}

3
vehicle/bmw.go
View file

@ -1,7 +1,6 @@
package vehicle
import (
"strings"
"time"
"github.com/evcc-io/evcc/api"
@ -65,7 +64,7 @@ func NewBMWMiniFromConfig(brand string, other map[string]interface{}) (api.Vehic
cc.VIN, err = ensureVehicle(cc.VIN, api.Vehicles)
if err == nil {
v.Provider = bmw.NewProvider(api, strings.ToUpper(cc.VIN), cc.Cache)
v.Provider = bmw.NewProvider(api, cc.VIN, cc.Cache)
}
return v, err

3
vehicle/enyaq.go
View file

@ -2,7 +2,6 @@ package vehicle
import (
"fmt"
"strings"
"time"
"github.com/evcc-io/evcc/api"
@ -67,7 +66,7 @@ func NewEnyaqFromConfig(other map[string]interface{}) (api.Vehicle, error) {
api := skoda.NewAPI(log, ts)
api.Client.Timeout = cc.Timeout
v.Provider = skoda.NewProvider(api, strings.ToUpper(cc.VIN), cc.Cache)
v.Provider = skoda.NewProvider(api, cc.VIN, cc.Cache)
}
return v, err

3
vehicle/fiat.go
View file

@ -2,7 +2,6 @@ package vehicle
import (
"fmt"
"strings"
"time"
"github.com/evcc-io/evcc/api"
@ -59,7 +58,7 @@ func NewFiatFromConfig(other map[string]interface{}) (api.Vehicle, error) {
cc.VIN, err = ensureVehicle(cc.VIN, api.Vehicles)
if err == nil {
v.Provider = fiat.NewProvider(api, strings.ToUpper(cc.VIN), cc.PIN, cc.Expiry, cc.Cache)
v.Provider = fiat.NewProvider(api, cc.VIN, cc.PIN, cc.Expiry, cc.Cache)
}
return v, err

3
vehicle/ford.go
View file

@ -2,7 +2,6 @@ package vehicle
import (
"fmt"
"strings"
"time"
"github.com/evcc-io/evcc/api"
@ -66,7 +65,7 @@ func NewFordFromConfig(other map[string]interface{}) (api.Vehicle, error) {
cc.VIN, err = ensureVehicle(cc.VIN, api.Vehicles)
if err == nil {
v.Provider = ford.NewProvider(api, strings.ToUpper(cc.VIN), cc.Expiry, cc.Cache)
v.Provider = ford.NewProvider(api, cc.VIN, cc.Expiry, cc.Cache)
}
return v, err

3
vehicle/id.go
View file

@ -2,7 +2,6 @@ package vehicle
import (
"fmt"
"strings"
"time"
"github.com/evcc-io/evcc/api"
@ -57,7 +56,7 @@ func NewIDFromConfig(other map[string]interface{}) (api.Vehicle, error) {
cc.VIN, err = ensureVehicle(cc.VIN, api.Vehicles)
if err == nil {
v.Provider = id.NewProvider(api, strings.ToUpper(cc.VIN), cc.Cache)
v.Provider = id.NewProvider(api, cc.VIN, cc.Cache)
}
return v, err

3
vehicle/nissan.go
View file

@ -2,7 +2,6 @@ package vehicle
import (
"fmt"
"strings"
"time"
"github.com/evcc-io/evcc/api"
@ -65,7 +64,7 @@ func NewNissanFromConfig(other map[string]interface{}) (api.Vehicle, error) {
cc.VIN, err = ensureVehicle(cc.VIN, api.Vehicles)
if err == nil {
v.Provider = nissan.NewProvider(api, strings.ToUpper(cc.VIN), cc.Expiry, cc.Cache)
v.Provider = nissan.NewProvider(api, cc.VIN, cc.Expiry, cc.Cache)
}
return v, err

8
vehicle/renault.go
View file

@ -150,9 +150,11 @@ func NewRenaultFromConfig(other map[string]interface{}) (api.Vehicle, error) {
})
}
v.batteryG = provider.NewCached(v.batteryAPI, cc.Cache).InterfaceGetter()
v.cockpitG = provider.NewCached(v.cockpitAPI, cc.Cache).InterfaceGetter()
v.hvacG = provider.NewCached(v.hvacAPI, cc.Cache).InterfaceGetter()
if err == nil {
v.batteryG = provider.NewCached(v.batteryAPI, cc.Cache).InterfaceGetter()
v.cockpitG = provider.NewCached(v.cockpitAPI, cc.Cache).InterfaceGetter()
v.hvacG = provider.NewCached(v.hvacAPI, cc.Cache).InterfaceGetter()
}
return v, err
}

5
vehicle/seat.go
View file

@ -2,7 +2,6 @@ package vehicle
import (
"fmt"
"strings"
"time"
"github.com/evcc-io/evcc/api"
@ -59,8 +58,8 @@ func NewSeatFromConfig(other map[string]interface{}) (api.Vehicle, error) {
cc.VIN, err = ensureVehicle(cc.VIN, api.Vehicles)
if err == nil {
if err = api.HomeRegion(strings.ToUpper(cc.VIN)); err == nil {
v.Provider = vw.NewProvider(api, strings.ToUpper(cc.VIN), cc.Cache)
if err = api.HomeRegion(cc.VIN); err == nil {
v.Provider = vw.NewProvider(api, cc.VIN, cc.Cache)
}
}

5
vehicle/skoda.go
View file

@ -2,7 +2,6 @@ package vehicle
import (
"fmt"
"strings"
"time"
"github.com/evcc-io/evcc/api"
@ -59,8 +58,8 @@ func NewSkodaFromConfig(other map[string]interface{}) (api.Vehicle, error) {
cc.VIN, err = ensureVehicle(cc.VIN, api.Vehicles)
if err == nil {
if err = api.HomeRegion(strings.ToUpper(cc.VIN)); err == nil {
v.Provider = vw.NewProvider(api, strings.ToUpper(cc.VIN), cc.Cache)
if err = api.HomeRegion(cc.VIN); err == nil {
v.Provider = vw.NewProvider(api, cc.VIN, cc.Cache)
}
}

2
vehicle/volvo.go
View file

@ -65,7 +65,7 @@ func NewVolvoFromConfig(other map[string]interface{}) (api.Vehicle, error) {
}, cc.Cache).InterfaceGetter()
var err error
cc.VIN, err = ensureVehicle(cc.VIN, v.vehicles)
v.vin, err = ensureVehicle(cc.VIN, v.vehicles)
return v, err
}

5
vehicle/vw.go
View file

@ -2,7 +2,6 @@ package vehicle
import (
"fmt"
"strings"
"time"
"github.com/evcc-io/evcc/api"
@ -58,8 +57,8 @@ func NewVWFromConfig(other map[string]interface{}) (api.Vehicle, error) {
cc.VIN, err = ensureVehicle(cc.VIN, api.Vehicles)
if err == nil {
if err = api.HomeRegion(strings.ToUpper(cc.VIN)); err == nil {
v.Provider = vw.NewProvider(api, strings.ToUpper(cc.VIN), cc.Cache)
if err = api.HomeRegion(cc.VIN); err == nil {
v.Provider = vw.NewProvider(api, cc.VIN, cc.Cache)
}
}