From 4c09be6553a8c9f87cec4083992f6466c10b72bd Mon Sep 17 00:00:00 2001
From: andig <cpuidle@gmx.de>
Date: Tue, 28 Dec 2021 11:28:58 +0100
Subject: [PATCH] Cleanup vehicle detection

---
 vehicle/audi.go    | 5 ++---
 vehicle/bmw.go     | 3 +--
 vehicle/enyaq.go   | 3 +--
 vehicle/fiat.go    | 3 +--
 vehicle/ford.go    | 3 +--
 vehicle/id.go      | 3 +--
 vehicle/nissan.go  | 3 +--
 vehicle/renault.go | 8 +++++---
 vehicle/seat.go    | 5 ++---
 vehicle/skoda.go   | 5 ++---
 vehicle/volvo.go   | 2 +-
 vehicle/vw.go      | 5 ++---
 12 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/vehicle/audi.go b/vehicle/audi.go
index c05637110..a1a2650b5 100644
--- a/vehicle/audi.go
+++ b/vehicle/audi.go
@@ -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)
 		}
 	}
 
diff --git a/vehicle/bmw.go b/vehicle/bmw.go
index 8781dd503..e2c42f748 100644
--- a/vehicle/bmw.go
+++ b/vehicle/bmw.go
@@ -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
diff --git a/vehicle/enyaq.go b/vehicle/enyaq.go
index 0383f7092..2d841a45f 100644
--- a/vehicle/enyaq.go
+++ b/vehicle/enyaq.go
@@ -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
diff --git a/vehicle/fiat.go b/vehicle/fiat.go
index ec681e80d..c219069ce 100644
--- a/vehicle/fiat.go
+++ b/vehicle/fiat.go
@@ -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
diff --git a/vehicle/ford.go b/vehicle/ford.go
index 2542e7eed..f028dab4c 100644
--- a/vehicle/ford.go
+++ b/vehicle/ford.go
@@ -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
diff --git a/vehicle/id.go b/vehicle/id.go
index d4934a7bd..7c3f75686 100644
--- a/vehicle/id.go
+++ b/vehicle/id.go
@@ -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
diff --git a/vehicle/nissan.go b/vehicle/nissan.go
index bdf447a2d..af44dfbb5 100644
--- a/vehicle/nissan.go
+++ b/vehicle/nissan.go
@@ -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
diff --git a/vehicle/renault.go b/vehicle/renault.go
index ea716e5f3..6ee7f73da 100644
--- a/vehicle/renault.go
+++ b/vehicle/renault.go
@@ -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
 }
diff --git a/vehicle/seat.go b/vehicle/seat.go
index b476f2854..8766240fd 100644
--- a/vehicle/seat.go
+++ b/vehicle/seat.go
@@ -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)
 		}
 	}
 
diff --git a/vehicle/skoda.go b/vehicle/skoda.go
index f83d5f0d3..7627ecaa6 100644
--- a/vehicle/skoda.go
+++ b/vehicle/skoda.go
@@ -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)
 		}
 	}
 
diff --git a/vehicle/volvo.go b/vehicle/volvo.go
index 3cf3162c1..4e3332541 100644
--- a/vehicle/volvo.go
+++ b/vehicle/volvo.go
@@ -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
 }
diff --git a/vehicle/vw.go b/vehicle/vw.go
index 020f9cd2c..960539246 100644
--- a/vehicle/vw.go
+++ b/vehicle/vw.go
@@ -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)
 		}
 	}