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

Remove deprecated configuration options (#2900)

Browse source
This commit is contained in:
andig 2022-03-17 10:42:15 +00:00 • committed by GitHub
parent 591dc4ad57
commit 45525316b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

16
charger/easee.go
View file

@ -65,29 +65,17 @@ func NewEaseeFromConfig(other map[string]interface{}) (api.Charger, error) {
User string
Password string
Charger string
Circuit int // deprecated
Cache time.Duration // deprecated
}{}
if err := util.DecodeOther(other, &cc); err != nil {
return nil, err
}
log := util.NewLogger("easee")
if cc.Circuit > 0 {
log.WARN.Println("circuit is deprecated and will be removed in a future release")
}
if cc.Cache > 0 {
log.WARN.Println("cache is deprecated and will be removed in a future release")
}
return NewEasee(cc.User, cc.Password, cc.Charger, cc.Cache)
return NewEasee(cc.User, cc.Password, cc.Charger)
}
// NewEasee creates Easee charger
func NewEasee(user, password, charger string, cache time.Duration) (*Easee, error) {
func NewEasee(user, password, charger string) (*Easee, error) {
log := util.NewLogger("easee").Redact(user, password)
if !sponsor.IsAuthorized() {

5
charger/wallbe.go
View file

@ -50,7 +50,6 @@ func NewWallbeFromConfig(other map[string]interface{}) (api.Charger, error) {
Legacy bool
Meter struct {
Power, Energy, Currents bool
Encoding interface{}
}
}{
URI: "192.168.0.8:502",
@ -65,10 +64,6 @@ func NewWallbeFromConfig(other map[string]interface{}) (api.Charger, error) {
return nil, err
}
if cc.Meter.Encoding != nil {
util.NewLogger("wallbe").WARN.Printf("encoding is deprecated and will be removed in a future release. Use firmware 01.04.21 instead.")
}
if cc.Legacy {
wb.factor = 1
}

10
core/loadpoint.go
View file

@ -104,8 +104,6 @@ type LoadPoint struct {
ChargeMeterRef string `mapstructure:"charge"` // deprecated
}
SoC SoCConfig
OnDisconnect_ interface{} `mapstructure:"onDisconnect"`
OnIdentify_ interface{} `mapstructure:"onIdentify"`
Enable, Disable ThresholdConfig
ResetOnDisconnect bool `mapstructure:"resetOnDisconnect"`
onDisconnect api.ActionConfig
@ -171,14 +169,6 @@ func NewLoadPointFromConfig(log *util.Logger, cp configProvider, other map[strin
lp.SoC.Poll.Mode = pollConnected
}
if lp.OnIdentify_ != nil {
lp.log.WARN.Printf("loadpoint.onIdentify is deprecated and will be removed in a future release. Use vehicle.onIdentify instead.")
}
if lp.OnDisconnect_ != nil {
lp.log.WARN.Printf("loadpoint.onDisconnect is deprecated and will be removed in a future release. Use loadpoint.resetOnDisconnect instead.")
}
// set vehicle polling interval
if lp.SoC.Poll.Interval < pollInterval {
if lp.SoC.Poll.Interval == 0 {

5
vehicle/vehicle.go
View file

@ -29,7 +29,6 @@ func NewConfigurableFromConfig(other map[string]interface{}) (api.Vehicle, error
Status *provider.Config
Range *provider.Config
Odometer *provider.Config
Cache interface{}
}{}
if err := util.DecodeOther(other, &cc); err != nil {
@ -43,10 +42,6 @@ func NewConfigurableFromConfig(other map[string]interface{}) (api.Vehicle, error
cc.Range.Deprecate(log)
cc.Odometer.Deprecate(log)
if cc.Cache != nil {
util.NewLogger("vehicle").WARN.Println("cache is deprecated and will be removed in a future release")
}
socG, err := provider.NewFloatGetterFromConfig(cc.Soc)
if err != nil {
return nil, fmt.Errorf("soc: %w", err)