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

Elapse PV scale timer immediately if not charging (#10113)

Browse source 
This prevents starting charging on PV only to stop again to switch phases
This commit is contained in:
Michael Heß 2023-10-01 13:02:01 +02:00 • committed by GitHub
parent 8f31abd5d4
commit 5f5af482c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/loadpoint.go
View file

@ -1045,6 +1045,10 @@ func (lp *Loadpoint) pvScalePhases(availablePower, minCurrent, maxCurrent float6
if targetCurrent := powerToCurrent(availablePower, activePhases); targetCurrent < minCurrent && activePhases > 1 && lp.ConfiguredPhases < 3 {
lp.log.DEBUG.Printf("available power %.0fW < %.0fW min %dp threshold", availablePower, float64(activePhases)*Voltage*minCurrent, activePhases)
if !lp.charging() { // scale immediately if not charging
lp.phaseTimer = elapsed
}
if lp.phaseTimer.IsZero() {
lp.log.DEBUG.Printf("start phase %s timer", phaseScale1p)
lp.phaseTimer = lp.clock.Now()
@ -1070,6 +1074,10 @@ func (lp *Loadpoint) pvScalePhases(availablePower, minCurrent, maxCurrent float6
if targetCurrent := powerToCurrent(availablePower, maxPhases); targetCurrent >= minCurrent && scalable {
lp.log.DEBUG.Printf("available power %.0fW > %.0fW min %dp threshold", availablePower, 3*Voltage*minCurrent, maxPhases)
if !lp.charging() { // scale immediately if not charging
lp.phaseTimer = elapsed
}
if lp.phaseTimer.IsZero() {
lp.log.DEBUG.Printf("start phase %s timer", phaseScale3p)
lp.phaseTimer = lp.clock.Now()

11
core/loadpoint_phases_test.go
View file

@ -192,6 +192,7 @@ func TestPvScalePhases(t *testing.T) {
vehicle: vehicle,
ConfiguredPhases: 0, // allow switching
phases: tc.physical,
status: api.StatusC,
}
if phaseCharger != nil {
@ -326,6 +327,15 @@ func TestPvScalePhasesTimer(t *testing.T) {
lp.phaseTimer = lp.clock.Now().Add(-dt)
}},
// switch down from 3p/0p while not yet charging
{"3/0->1, not enough power, not charging", 3, 0, 0, 1, true, func(lp *Loadpoint) {
lp.status = api.StatusB
}},
// switch up from 1p/0p while not yet charging
{"1/0->3, enough power, not charging", 1, 0, 3 * Voltage * minA, 3, true, func(lp *Loadpoint) {
lp.status = api.StatusB
}},
// error states from 1p/3p misconfig - no correction for time being (stay at 1p)
{"1/3->1, enough power", 1, 3, 1 * Voltage * maxA, 1, false, nil},
{"1/3->1, kickoff, correct phase setting", 1, 3, 1 * Voltage * maxA, 1, false, func(lp *Loadpoint) {
@ -352,6 +362,7 @@ func TestPvScalePhasesTimer(t *testing.T) {
MaxCurrent: maxA,
phases: tc.phases,
measuredPhases: tc.measuredPhases,
status: api.StatusC,
Enable: ThresholdConfig{
Delay: dt,
},