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

chore: simplify overriding defaults

Browse source
This commit is contained in:
andig 2023-03-05 23:00:48 +01:00
parent eda42ae840
commit 75a488a710
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
core/loadpoint.go
View file

@ -466,18 +466,17 @@ func (lp *Loadpoint) evVehicleDisconnectHandler() {
lp.setVehicleIdentifier("")
lp.stopVehicleDetection()
// remove active vehicle if not default
if lp.vehicle != lp.defaultVehicle {
lp.setActiveVehicle(lp.defaultVehicle)
// set default vehicle (may be nil)
lp.setActiveVehicle(lp.defaultVehicle)
// set defaults
if lp.ResetOnDisconnect {
lp.applyAction(lp.onDisconnect)
}
// set default mode on disconnect
if lp.ResetOnDisconnect {
actionCfg := lp.onDisconnect
if v := lp.defaultVehicle; v != nil {
actionCfg = actionCfg.Merge(v.OnIdentified())
}
lp.applyAction(actionCfg)
// override global defaults with default vehicle
if lp.defaultVehicle != nil {
lp.applyAction(lp.defaultVehicle.OnIdentified())
}
// soc update reset