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

Update soc once when charging has stopped (#6267)

Browse source
This commit is contained in:
nename0 2023-02-19 18:11:00 +01:00 • committed by GitHub
parent 021f050757
commit 23b6dfb882
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

46
core/loadpoint.go
View file

@ -119,15 +119,16 @@ type Loadpoint struct {
MaxCurrent float64 // Max allowed current. Physically ensured by the charger
GuardDuration time.Duration // charger enable/disable minimum holding time
enabled bool // Charger enabled state
phases int // Charger enabled phases, guarded by mutex
measuredPhases int // Charger physically measured phases
chargeCurrent float64 // Charger current limit
guardUpdated time.Time // Charger enabled/disabled timestamp
socUpdated time.Time // Soc updated timestamp (poll: connected)
vehicleDetect time.Time // Vehicle connected timestamp
vehicleDetectTicker *clock.Ticker
vehicleIdentifier string
enabled bool // Charger enabled state
phases int // Charger enabled phases, guarded by mutex
measuredPhases int // Charger physically measured phases
chargeCurrent float64 // Charger current limit
guardUpdated time.Time // Charger enabled/disabled timestamp
socUpdated time.Time // Soc updated timestamp (poll: connected)
didChargeOnLastSocUpdate bool // There was a charge process when Soc was updated last
vehicleDetect time.Time // Vehicle connected timestamp
vehicleDetectTicker *clock.Ticker
vehicleIdentifier string
charger api.Charger
chargeTimer api.ChargeTimer
@ -1304,17 +1305,34 @@ func (lp *Loadpoint) publishChargeProgress() {
// socPollAllowed validates charging state against polling mode
func (lp *Loadpoint) socPollAllowed() bool {
// always update soc when charging
if lp.charging() {
lp.didChargeOnLastSocUpdate = true
return true
}
// update if connected and soc unknown
if lp.connected() && lp.socUpdated.IsZero() {
return true
}
remaining := lp.Soc.Poll.Interval - lp.clock.Since(lp.socUpdated)
honourUpdateInterval := lp.Soc.Poll.Mode == pollAlways ||
lp.Soc.Poll.Mode == pollConnected && lp.connected() ||
lp.Soc.Poll.Mode == pollCharging && lp.connected() && (lp.vehicleSoc < float64(lp.Soc.target))
lp.connected() && (lp.Soc.Poll.Mode == pollConnected ||
// for mode charging allow one last soc update if did charge previously to not rely on soc estimator too much
lp.Soc.Poll.Mode == pollCharging && lp.didChargeOnLastSocUpdate)
if honourUpdateInterval && remaining > 0 {
lp.log.DEBUG.Printf("next soc poll remaining time: %v", remaining.Truncate(time.Second))
if honourUpdateInterval {
if remaining > 0 {
lp.log.DEBUG.Printf("next soc poll remaining time: %v", remaining.Truncate(time.Second))
} else {
lp.didChargeOnLastSocUpdate = false
return true
}
}
return lp.charging() || honourUpdateInterval && (remaining <= 0) || lp.connected() && lp.socUpdated.IsZero()
return false
}
// checks if the connected charger can provide Soc to the connected vehicle

5
core/loadpoint_test.go
View file

@ -680,7 +680,10 @@ func TestSocPoll(t *testing.T) {
{pollCharging, api.StatusC, -1, true},
{pollCharging, api.StatusC, 0, true},
{pollCharging, api.StatusC, tNoRefresh, true}, // cached by vehicle
{pollCharging, api.StatusC, tRefresh, true},
{pollCharging, api.StatusC, tRefresh, true}, // will set lp.didChargeOnLastSocUpdate
{pollCharging, api.StatusB, 0, false}, // last update must wait for interval
{pollCharging, api.StatusB, tRefresh, true}, // update once if connected and was charging
{pollCharging, api.StatusB, tRefresh, false}, // but only once
// pollConnected
{pollConnected, api.StatusA, -1, false},