diff --git a/vehicle/skoda-enyaq.go b/vehicle/skoda-enyaq.go index cd4d72afa..1ba3b0d07 100644 --- a/vehicle/skoda-enyaq.go +++ b/vehicle/skoda-enyaq.go @@ -6,8 +6,8 @@ import ( "github.com/evcc-io/evcc/api" "github.com/evcc-io/evcc/util" "github.com/evcc-io/evcc/util/request" - "github.com/evcc-io/evcc/vehicle/skoda/myskoda" - "github.com/evcc-io/evcc/vehicle/skoda/myskoda/service" + "github.com/evcc-io/evcc/vehicle/skoda" + "github.com/evcc-io/evcc/vehicle/skoda/service" ) // https://gitlab.com/prior99/skoda @@ -15,7 +15,7 @@ import ( // Enyaq is an api.Vehicle implementation for Skoda Enyaq cars type Enyaq struct { *embed - *myskoda.Provider // provides the api implementations + *skoda.Provider // provides the api implementations } func init() { @@ -50,17 +50,17 @@ func NewEnyaqFromConfig(other map[string]interface{}) (api.Vehicle, error) { log := util.NewLogger("enyaq").Redact(cc.User, cc.Password, cc.VIN) // use Skoda api to resolve list of vehicles - ts, err := service.TokenRefreshServiceTokenSource(log, myskoda.TRSParams, myskoda.AuthParams, cc.User, cc.Password) + ts, err := service.TokenRefreshServiceTokenSource(log, skoda.TRSParams, skoda.AuthParams, cc.User, cc.Password) if err != nil { return nil, err } - api := myskoda.NewAPI(log, ts) + api := skoda.NewAPI(log, ts) api.Client.Timeout = cc.Timeout vehicle, err := ensureVehicleEx( cc.VIN, api.Vehicles, - func(v myskoda.Vehicle) (string, error) { + func(v skoda.Vehicle) (string, error) { return v.VIN, nil }, ) @@ -75,10 +75,10 @@ func NewEnyaqFromConfig(other map[string]interface{}) (api.Vehicle, error) { // reuse tokenService to build provider if err == nil { - api := myskoda.NewAPI(log, ts) + api := skoda.NewAPI(log, ts) api.Client.Timeout = cc.Timeout - v.Provider = myskoda.NewProvider(api, vehicle.VIN, cc.Cache) + v.Provider = skoda.NewProvider(api, vehicle.VIN, cc.Cache) } return v, err diff --git a/vehicle/skoda/myskoda/api.go b/vehicle/skoda/api.go similarity index 99% rename from vehicle/skoda/myskoda/api.go rename to vehicle/skoda/api.go index 517545f20..01b3ee9e8 100644 --- a/vehicle/skoda/myskoda/api.go +++ b/vehicle/skoda/api.go @@ -1,4 +1,4 @@ -package myskoda +package skoda import ( "fmt" diff --git a/vehicle/skoda/myskoda/params.go b/vehicle/skoda/params.go similarity index 97% rename from vehicle/skoda/myskoda/params.go rename to vehicle/skoda/params.go index 38c45162d..ada3cacf5 100644 --- a/vehicle/skoda/myskoda/params.go +++ b/vehicle/skoda/params.go @@ -1,4 +1,4 @@ -package myskoda +package skoda import "net/url" diff --git a/vehicle/skoda/myskoda/provider.go b/vehicle/skoda/provider.go similarity index 99% rename from vehicle/skoda/myskoda/provider.go rename to vehicle/skoda/provider.go index 286d12ab3..c6c4a796e 100644 --- a/vehicle/skoda/myskoda/provider.go +++ b/vehicle/skoda/provider.go @@ -1,4 +1,4 @@ -package myskoda +package skoda import ( "time" diff --git a/vehicle/skoda/myskoda/service/tokenrefreshservice.go b/vehicle/skoda/service/tokenrefreshservice.go similarity index 88% rename from vehicle/skoda/myskoda/service/tokenrefreshservice.go rename to vehicle/skoda/service/tokenrefreshservice.go index 7293aff62..084278302 100644 --- a/vehicle/skoda/myskoda/service/tokenrefreshservice.go +++ b/vehicle/skoda/service/tokenrefreshservice.go @@ -4,7 +4,7 @@ import ( "net/url" "github.com/evcc-io/evcc/util" - "github.com/evcc-io/evcc/vehicle/skoda/myskoda/tokenrefreshservice" + "github.com/evcc-io/evcc/vehicle/skoda/tokenrefreshservice" "github.com/evcc-io/evcc/vehicle/vag" "github.com/evcc-io/evcc/vehicle/vag/vwidentity" ) diff --git a/vehicle/skoda/myskoda/tokenrefreshservice/endpoint.go b/vehicle/skoda/tokenrefreshservice/endpoint.go similarity index 100% rename from vehicle/skoda/myskoda/tokenrefreshservice/endpoint.go rename to vehicle/skoda/tokenrefreshservice/endpoint.go diff --git a/vehicle/skoda/myskoda/types.go b/vehicle/skoda/types.go similarity index 99% rename from vehicle/skoda/myskoda/types.go rename to vehicle/skoda/types.go index d5ccebdf6..780a6fe6a 100644 --- a/vehicle/skoda/myskoda/types.go +++ b/vehicle/skoda/types.go @@ -1,4 +1,4 @@ -package myskoda +package skoda // VehiclesResponse is the /v3/garage api type VehiclesResponse struct {