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

Session: don't use meter totals for overriding session energy (#7460)

Browse source
This commit is contained in:
andig 2023-04-14 21:17:23 +02:00 • committed by GitHub
parent c7c75b4dfe
commit c49d9bb25d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/loadpoint.go
View file

@ -1274,7 +1274,7 @@ func (lp *Loadpoint) publishChargeProgress() {
if f, err := lp.chargeRater.ChargedEnergy(); err == nil {
// workaround for Go-E resetting during disconnect, see
// https://github.com/evcc-io/evcc/issues/5092
if f > 0 {
if f > lp.chargedAtStartup {
lp.setChargedEnergy(1e3 * (f - lp.chargedAtStartup)) // convert to Wh
}
} else {

7
core/loadpoint_session.go
View file

@ -58,12 +58,7 @@ func (lp *Loadpoint) stopSession() {
lp.session.Finished = lp.clock.Now()
lp.session.MeterStop = lp.chargeMeterTotal()
chargedEnergy := lp.getChargedEnergy() / 1e3
if delta := lp.session.MeterStop - lp.session.MeterStart; delta < chargedEnergy && lp.session.MeterStart*lp.session.MeterStop > 0 {
chargedEnergy = delta
}
if chargedEnergy > lp.session.ChargedEnergy {
if chargedEnergy := lp.getChargedEnergy() / 1e3; chargedEnergy > lp.session.ChargedEnergy {
lp.session.ChargedEnergy = chargedEnergy
}

5
core/loadpoint_session_test.go
View file

@ -70,7 +70,7 @@ func TestSession(t *testing.T) {
s, err := db.Sessions()
assert.NoError(t, err)
assert.Len(t, s, 1)
t.Log(s)
t.Logf("session: %+v", s)
// stop charging - 2nd leg
clock.Add(time.Hour)
@ -79,11 +79,10 @@ func TestSession(t *testing.T) {
lp.stopSession()
assert.NotNil(t, lp.session)
assert.Equal(t, 3.0-1.0, lp.session.ChargedEnergy) // expect actual meter energy delta
assert.Equal(t, clock.Now(), lp.session.Finished)
s, err = db.Sessions()
assert.NoError(t, err)
assert.Len(t, s, 1)
t.Log(s)
t.Logf("session: %+v", s)
}