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

Validate vehicle min/max currents against loadpoint defaults (#4123)

Browse source
This commit is contained in:
andig 2022-08-17 12:35:13 +02:00 • committed by GitHub
parent 58ca0b16dc
commit 5e0c67c56b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/loadpoint.go
View file

@ -477,11 +477,11 @@ func (lp *LoadPoint) applyAction(actionCfg api.ActionConfig) {
if actionCfg.Mode != nil {
lp.SetMode(*actionCfg.Mode)
}
if actionCfg.MinCurrent != nil {
lp.SetMinCurrent(*actionCfg.MinCurrent)
if min := actionCfg.MinCurrent; min != nil && *min >= *lp.onDisconnect.MinCurrent {
lp.SetMinCurrent(*min)
}
if actionCfg.MaxCurrent != nil {
lp.SetMaxCurrent(*actionCfg.MaxCurrent)
if max := actionCfg.MaxCurrent; max != nil && *max <= *lp.onDisconnect.MaxCurrent {
lp.SetMaxCurrent(*max)
}
if actionCfg.MinSoC != nil {
lp.SetMinSoC(*actionCfg.MinSoC)

11
core/loadpoint_vehicle_test.go
View file

@ -172,8 +172,11 @@ func TestApplyVehicleDefaults(t *testing.T) {
}
}
oi := newConfig(api.ModePV, 7, 17, 1, 99)
od := newConfig(api.ModeOff, 5, 15, 2, 98)
// onIdentified config
oi := newConfig(api.ModePV, 7, 15, 1, 99)
// onDefault config
od := newConfig(api.ModeOff, 6, 16, 2, 98)
vehicle := mock.NewMockVehicle(ctrl)
vehicle.EXPECT().Title().Return("it's me").AnyTimes()
@ -189,6 +192,10 @@ func TestApplyVehicleDefaults(t *testing.T) {
lp.onDisconnect = od
lp.ResetOnDisconnect = true
// check loadpoint default currents can't be violated
lp.applyAction(newConfig(*od.Mode, 5, 17, *od.MinSoC, *od.TargetSoC))
assertConfig(lp, od)
// vehicle identified
lp.setActiveVehicle(vehicle)
assertConfig(lp, oi)