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

Fix vehicle unable to override min current (#12866)

Browse source
This commit is contained in:
andig 2024-03-11 12:31:34 +01:00 • committed by GitHub
parent d189d03c37
commit bddb25adeb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 26 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

25
core/loadpoint_effective.go
View file

@ -60,26 +60,29 @@ func (lp *Loadpoint) SocBasedPlanning() bool {
// effectiveMinCurrent returns the effective min current
func (lp *Loadpoint) effectiveMinCurrent() float64 {
minCurrent := lp.GetMinCurrent()
lpMin := lp.GetMinCurrent()
var vehicleMin, chargerMin float64
if v := lp.GetVehicle(); v != nil {
if res, ok := v.OnIdentified().GetMinCurrent(); ok {
minCurrent = max(minCurrent, res)
vehicleMin = res
}
}
if c, ok := lp.charger.(api.CurrentLimiter); ok {
if res, _, err := c.GetMinMaxCurrent(); err == nil {
if res > 0 && res < minCurrent {
minCurrent = res
} else {
minCurrent = max(minCurrent, res)
}
lp.publish(keys.EffectiveMinCurrent, minCurrent)
chargerMin = res
}
}
return minCurrent
switch {
case max(vehicleMin, chargerMin) == 0:
return lpMin
case chargerMin > 0:
return max(vehicleMin, chargerMin)
default:
return max(vehicleMin, lpMin)
}
}
// effectiveMaxCurrent returns the effective max current
@ -87,13 +90,13 @@ func (lp *Loadpoint) effectiveMaxCurrent() float64 {
maxCurrent := lp.GetMaxCurrent()
if v := lp.GetVehicle(); v != nil {
if res, ok := v.OnIdentified().GetMaxCurrent(); ok {
if res, ok := v.OnIdentified().GetMaxCurrent(); ok && res > 0 {
maxCurrent = min(maxCurrent, res)
}
}
if c, ok := lp.charger.(api.CurrentLimiter); ok {
if _, res, err := c.GetMinMaxCurrent(); err == nil {
if _, res, err := c.GetMinMaxCurrent(); err == nil && res > 0 {
maxCurrent = min(maxCurrent, res)
lp.publish(keys.EffectiveMaxCurrent, maxCurrent)
}

20
core/loadpoint_effective_test.go
View file

@ -21,12 +21,16 @@ func TestEffectiveMinMaxCurrent(t *testing.T) {
effectiveMin, effectiveMax float64
}{
{0, 0, 0, 0, 6, 16},
{1, 10, 0, 0, 1, 10}, // charger lower
{10, 20, 0, 0, 10, 16}, // charger higher - max ignored
{0, 0, 1, 10, 6, 10}, // vehicle lower - min ignored
{0, 0, 10, 20, 10, 16}, // vehicle higher - max ignored
{1, 10, 2, 12, 1, 10}, // charger + vehicle lower
{10, 20, 12, 22, 10, 16}, // charger + vehicle higher
{2, 0, 0, 0, 2, 16}, // charger min lower, max empty - charger wins
{7, 0, 0, 0, 7, 16}, // charger min higher, max empty (no practical use)
{0, 10, 0, 0, 6, 10}, // charger max lower, min empty - loadpoint wins
{0, 20, 0, 0, 6, 16}, // charger max higher, min empty - loadpoint wins
{0, 0, 5, 0, 6, 16}, // vehicle min lower, max empty - loadpoint wins
{0, 0, 8, 0, 8, 16}, // vehicle min higher, max empty - vehicle wins
{0, 0, 0, 10, 6, 10}, // vehicle max lower, min empty - vehicle wins
{0, 0, 0, 20, 6, 16}, // vehicle max higher, min empty - loadpoint wins
{2, 0, 5, 0, 5, 16}, // charger + vehicle min lower, max empty - vehicle wins
{0, 20, 0, 32, 6, 16}, // charger + vehicle max higher, min empty - loadpoint wins
}
for _, tc := range tc {
@ -60,7 +64,7 @@ func TestEffectiveMinMaxCurrent(t *testing.T) {
lp.vehicle = vehicle
}
assert.Equal(t, tc.effectiveMin, lp.effectiveMinCurrent())
assert.Equal(t, tc.effectiveMax, lp.effectiveMaxCurrent())
assert.Equal(t, tc.effectiveMin, lp.effectiveMinCurrent(), "min")
assert.Equal(t, tc.effectiveMax, lp.effectiveMaxCurrent(), "max")
}
}