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

Revert "Loadpoint: replace empty session energy round trip with meter values (#22279)"

Browse source 
This reverts commit d85f2610e0.
This commit is contained in:
andig 2025-07-10 19:48:05 +02:00
parent 581592f03b
commit 0899b44c5a
2 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
core/loadpoint_session.go
View file

@ -68,17 +68,12 @@ func (lp *Loadpoint) stopSession() {
}
s.Finished = lp.clock.Now()
// record meter stop
if meterStop := lp.chargeMeterTotal(); meterStop > 0 {
s.MeterStop = &meterStop
}
if s.MeterStart != nil {
// use meter stop to override charged energy, but prevent negative values
if chargedEnergy := *s.MeterStop - *s.MeterStart; chargedEnergy > max(0, s.ChargedEnergy) {
lp.energyMetrics.Update(chargedEnergy)
}
}
if chargedEnergy := lp.GetChargedEnergy() / 1e3; chargedEnergy > s.ChargedEnergy {
lp.energyMetrics.Update(chargedEnergy)
}
s.SolarPercentage = lo.ToPtr(lp.energyMetrics.SolarPercentage())

2
core/loadpoint_session_test.go
View file

@ -241,7 +241,7 @@ func TestResetHeatingSession(t *testing.T) {
assert.Equal(t, clock.Now(), lp.session.Created)
clock.Add(36 * time.Hour)
me.EXPECT().TotalEnergy().Return(1.0, nil).Times(2)
me.EXPECT().TotalEnergy().Return(1.0, nil).MaxTimes(2)
lp.resetHeatingSession()
require.NotNil(t, lp.session)