Skip to content

Extending instead of resetting charger delay times #25649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 12 commits into
base: master
Choose a base branch
from
Draft

Extending instead of resetting charger delay times #25649

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
662487a
Extending instead of resetting charger delay times
waynistan Nov 27, 2025
92f6639
fetch current time once
waynistan Nov 27, 2025
1c4ab73
add missing publishTimer() calls & debug logs
waynistan Nov 27, 2025
5889a48
Revert "add missing publishTimer() calls & debug logs"
waynistan Nov 28, 2025
f8ced1e
fix disable delay
waynistan Nov 28, 2025
a4d4743
fix syntax error
waynistan Nov 28, 2025
cff40d3
fix type error
waynistan Nov 28, 2025
da20906
remove whitespace
waynistan Nov 28, 2025
33f87a0
reformat
waynistan Nov 28, 2025
dca5cec
nolint
waynistan Nov 28, 2025
0e1f44b
undo projectedSitePower calculation changes
waynistan Nov 28, 2025
d1d1992
readd missing publishTimer() calls & debug logs
waynistan Nov 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
150 changes: 94 additions & 56 deletions core/loadpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,15 @@ type Loadpoint struct {
planActive bool // charge plan exists and has a currently active slot

// cached state
status api.ChargeStatus // Charger status
chargePower float64 // Charging power
chargeCurrents []float64 // Phase currents
connectedTime time.Time // Time when vehicle was connected
pvTimer time.Time // PV enabled/disable timer
phaseTimer time.Time // 1p3p switch timer
wakeUpTimer *Timer // Vehicle wake-up timeout
status api.ChargeStatus // Charger status
chargePower float64 // Charging power
chargeCurrents []float64 // Phase currents
connectedTime time.Time // Time when vehicle was connected
pvTimer time.Time // PV enable/disable timer
pvTimerEvaluated time.Time // PV enable/disable timer last evaluation timestamp
phaseTimer time.Time // 1p3p switch timer
phaseTimerEvaluated time.Time // 1p3p switch timer last evaluation timestamp
wakeUpTimer *Timer // Vehicle wake-up timeout

// charge progress
vehicleSoc float64 // Vehicle or charger soc
Expand Down Expand Up @@ -1304,10 +1306,10 @@ func (lp *Loadpoint) pvScalePhases(sitePower, minCurrent, maxCurrent float64) in
lp.ResetMeasuredPhases()
}

var waiting bool
activePhases := lp.ActivePhases()
availablePower := lp.chargePower - sitePower
scalable := (sitePower > 0 || !lp.enabled) && activePhases > 1 && lp.phasesConfigured < 3
now := lp.clock.Now()

// scale down phases
if targetCurrent := powerToCurrent(availablePower, activePhases); targetCurrent < minCurrent && scalable {
Expand All @@ -1319,19 +1321,27 @@ func (lp *Loadpoint) pvScalePhases(sitePower, minCurrent, maxCurrent float64) in

if lp.phaseTimer.IsZero() {
lp.log.DEBUG.Printf("start phase %s timer", phaseScale1p)
lp.phaseTimer = lp.clock.Now()
lp.phaseTimer = now
}

lp.publishTimer(phaseTimer, lp.GetDisableDelay(), phaseScale1p)

if elapsed := lp.clock.Since(lp.phaseTimer); elapsed >= lp.GetDisableDelay() {
if elapsed := now.Sub(lp.phaseTimer); elapsed >= lp.GetDisableDelay() {
if err := lp.scalePhases(1); err != nil {
lp.log.ERROR.Println(err)
}
return 1
}
} else if !lp.phaseTimer.IsZero() {
// increase delay
lp.phaseTimer = lp.phaseTimer.Add(2 * now.Sub(lp.phaseTimerEvaluated))

waiting = true
// reset timer to disabled state if the delay would be too long
if lp.phaseTimer.After(now) {
lp.resetPhaseTimer()
} else {
lp.publishTimer(phaseTimer, lp.GetDisableDelay(), phaseScale1p)
}
}

maxPhases := lp.MaxActivePhases()
Expand All @@ -1348,26 +1358,30 @@ func (lp *Loadpoint) pvScalePhases(sitePower, minCurrent, maxCurrent float64) in

if lp.phaseTimer.IsZero() {
lp.log.DEBUG.Printf("start phase %s timer", phaseScale3p)
lp.phaseTimer = lp.clock.Now()
lp.phaseTimer = now
}

lp.publishTimer(phaseTimer, lp.GetEnableDelay(), phaseScale3p)

if elapsed := lp.clock.Since(lp.phaseTimer); elapsed >= lp.GetEnableDelay() {
if elapsed := now.Sub(lp.phaseTimer); elapsed >= lp.GetEnableDelay() {
if err := lp.scalePhases(3); err != nil {
lp.log.ERROR.Println(err)
}
return 3
}
} else if !lp.phaseTimer.IsZero() {
// increase delay
lp.phaseTimer = lp.phaseTimer.Add(2 * now.Sub(lp.phaseTimerEvaluated))

waiting = true
}

// reset timer to disabled state
if !waiting && !lp.phaseTimer.IsZero() {
lp.resetPhaseTimer()
// reset timer to disabled state if the delay would be too long
if lp.phaseTimer.After(now) {
lp.resetPhaseTimer()
} else {
lp.publishTimer(phaseTimer, lp.GetEnableDelay(), phaseScale3p)
}
}

lp.phaseTimerEvaluated = now
return 0
}

Expand Down Expand Up @@ -1466,61 +1480,75 @@ func (lp *Loadpoint) pvMaxCurrent(mode api.ChargeMode, sitePower, batteryBoostPo

lp.log.DEBUG.Printf("pv charge current: %.3gA = %.3gA + %.3gA (%.0fW @ %dp)", targetCurrent, effectiveCurrent, deltaCurrent, sitePower, activePhases)

if mode == api.ModePV && lp.enabled && targetCurrent < minCurrent {
projectedSitePower := sitePower
if lp.hasPhaseSwitching() && !lp.phaseTimer.IsZero() {
// calculate site power after a phase switch from activePhases phases -> 1 phase
// notes: activePhases can be 1, 2 or 3 and phaseTimer can only be active if lp current is already at minCurrent
projectedSitePower -= Voltage * minCurrent * float64(activePhases-1)
}
// kick off disable sequence
if projectedSitePower >= lp.Disable.Threshold {
lp.log.DEBUG.Printf("projected site power %.0fW >= %.0fW disable threshold", projectedSitePower, lp.Disable.Threshold)
if mode == api.ModePV {
now := lp.clock.Now()

if lp.pvTimer.IsZero() {
lp.log.DEBUG.Printf("pv disable timer start: %v", lp.GetDisableDelay())
lp.pvTimer = lp.clock.Now()
if lp.enabled {
projectedSitePower := sitePower

if lp.hasPhaseSwitching() && !lp.phaseTimer.IsZero() {
// calculate site power after a phase switch from activePhases phases -> 1 phase
// notes: activePhases can be 1, 2 or 3 and phaseTimer can only be active if lp current is already at minCurrent
projectedSitePower -= Voltage * minCurrent * float64(activePhases-1)
}

lp.publishTimer(pvTimer, lp.GetDisableDelay(), pvDisable)
// kick off disable sequence
if projectedSitePower >= lp.Disable.Threshold && targetCurrent < minCurrent {
lp.log.DEBUG.Printf("projected site power %.0fW >= %.0fW disable threshold", projectedSitePower, lp.Disable.Threshold)

elapsed := lp.clock.Since(lp.pvTimer)
if elapsed >= lp.GetDisableDelay() {
lp.log.DEBUG.Println("pv disable timer elapsed")
if lp.pvTimer.IsZero() {
lp.log.DEBUG.Printf("pv disable timer start: %v", lp.GetDisableDelay())
lp.pvTimer = now
}

// reset timer to prevent immediate charger re-enabling
lp.resetPVTimer()
lp.publishTimer(pvTimer, lp.GetDisableDelay(), pvDisable)

return 0
}
elapsed := now.Sub(lp.pvTimer)
if elapsed >= lp.GetDisableDelay() {
lp.log.DEBUG.Println("pv disable timer elapsed")

// suppress duplicate log message after timer started
if elapsed > time.Second {
lp.log.DEBUG.Printf("pv disable timer remaining: %v", (lp.GetDisableDelay() - elapsed).Round(time.Second))
// reset timer to prevent immediate charger re-enabling
lp.resetPVTimer()

return 0
}

// suppress duplicate log message after timer started
if elapsed > time.Second {
lp.log.DEBUG.Printf("pv disable timer remaining: %v", (lp.GetDisableDelay() - elapsed).Round(time.Second))
}
} else if !lp.pvTimer.IsZero() {
// increase delay
lp.pvTimer = lp.pvTimer.Add(2 * now.Sub(lp.pvTimerEvaluated))
elapsed := now.Sub(lp.pvTimer)

// reset timer if the delay would be too long
if elapsed < 0 {
lp.resetPVTimer("disable")
} else {
lp.publishTimer(pvTimer, lp.GetDisableDelay(), pvDisable)
lp.log.DEBUG.Printf("pv disable timer remaining: %v", (lp.GetDisableDelay() - elapsed).Round(time.Second))
}
}
} else {
// reset timer
lp.resetPVTimer("disable")
}

// lp.log.DEBUG.Println("pv disable timer: keep enabled")
return minCurrent
}
// lp.log.DEBUG.Println("pv disable timer: keep enabled")
lp.pvTimerEvaluated = now
return max(minCurrent, targetCurrent)
}

if mode == api.ModePV && !lp.enabled {
// kick off enable sequence
if (lp.Enable.Threshold == 0 && targetCurrent >= minCurrent) ||
(lp.Enable.Threshold != 0 && sitePower <= lp.Enable.Threshold) {
lp.log.DEBUG.Printf("site power %.0fW <= %.0fW enable threshold", sitePower, lp.Enable.Threshold)

if lp.pvTimer.IsZero() {
lp.log.DEBUG.Printf("pv enable timer start: %v", lp.GetEnableDelay())
lp.pvTimer = lp.clock.Now()
lp.pvTimer = now
}

lp.publishTimer(pvTimer, lp.GetEnableDelay(), pvEnable)

elapsed := lp.clock.Since(lp.pvTimer)
elapsed := now.Sub(lp.pvTimer)
if elapsed >= lp.GetEnableDelay() {
lp.log.DEBUG.Println("pv enable timer elapsed")

Expand All @@ -1534,12 +1562,22 @@ func (lp *Loadpoint) pvMaxCurrent(mode api.ChargeMode, sitePower, batteryBoostPo
if elapsed > time.Second {
lp.log.DEBUG.Printf("pv enable timer remaining: %v", (lp.GetEnableDelay() - elapsed).Round(time.Second))
}
} else {
// reset timer
lp.resetPVTimer("enable")
} else if !lp.pvTimer.IsZero() {
// increase delay
lp.pvTimer = lp.pvTimer.Add(2 * now.Sub(lp.pvTimerEvaluated))
elapsed := now.Sub(lp.pvTimer)

// reset timer if the delay would be too long
if elapsed < 0 {
lp.resetPVTimer("enable")
} else {
lp.publishTimer(pvTimer, lp.GetEnableDelay(), pvEnable)
lp.log.DEBUG.Printf("pv enable timer remaining: %v", (lp.GetEnableDelay() - elapsed).Round(time.Second))
}
}

// lp.log.DEBUG.Println("pv enable timer: keep disabled")
lp.pvTimerEvaluated = now
return 0
}

Expand Down
Loading