Remove deprecated Smart EQ (#32294)
This commit is contained in:
parent
f8584ebb6e
commit
05676e7c68
2 changed files with 8 additions and 20 deletions
|
|
@ -28,7 +28,7 @@ params:
|
|||
- name: cache
|
||||
default: 15m
|
||||
render: |
|
||||
type: smart-eq
|
||||
type: mercedes
|
||||
vin: {{ .vin }}
|
||||
user: {{ .user }}
|
||||
region: {{ .region }}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
package vehicle
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"time"
|
||||
|
||||
"github.com/evcc-io/evcc/api"
|
||||
|
|
@ -16,16 +15,11 @@ type Mercedes struct {
|
|||
}
|
||||
|
||||
func init() {
|
||||
registry.Add("mercedes", func(other map[string]any) (api.Vehicle, error) {
|
||||
return newMercedesFromConfig("mercedes", other)
|
||||
})
|
||||
registry.Add("smart-eq", func(other map[string]any) (api.Vehicle, error) {
|
||||
return newMercedesFromConfig("smart-eq", other)
|
||||
})
|
||||
registry.Add("mercedes", NewMercedesFromConfig)
|
||||
}
|
||||
|
||||
// newMercedesFromConfig creates a new vehicle
|
||||
func newMercedesFromConfig(brand string, other map[string]any) (api.Vehicle, error) {
|
||||
// NewMercedesFromConfig creates a new vehicle
|
||||
func NewMercedesFromConfig(other map[string]any) (api.Vehicle, error) {
|
||||
cc := struct {
|
||||
embed `mapstructure:",squash"`
|
||||
Tokens Tokens
|
||||
|
|
@ -51,7 +45,7 @@ func newMercedesFromConfig(brand string, other map[string]any) (api.Vehicle, err
|
|||
cc.User = cc.Account_
|
||||
}
|
||||
|
||||
log := util.NewLogger(brand).Redact(cc.Tokens.Access, cc.Tokens.Refresh)
|
||||
log := util.NewLogger("mercedes").Redact(cc.Tokens.Access, cc.Tokens.Refresh)
|
||||
identity, err := mercedes.NewIdentity(log, token, cc.User, cc.Region)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
|
@ -59,15 +53,9 @@ func newMercedesFromConfig(brand string, other map[string]any) (api.Vehicle, err
|
|||
|
||||
api := mercedes.NewAPI(log, identity)
|
||||
|
||||
if brand == "smart-eq" {
|
||||
if cc.VIN == "" {
|
||||
return nil, errors.New("missing VIN")
|
||||
}
|
||||
} else {
|
||||
cc.VIN, err = ensureVehicle(cc.VIN, api.Vehicles)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
cc.VIN, err = ensureVehicle(cc.VIN, api.Vehicles)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
v := &Mercedes{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue