Skip to content
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

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

Merged
merged 2 commits into from
Apr 14, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ceb6ef
Session: don't use meter totals for overriding session energy
andig Apr 14, 2023
6a472f0
wip
andig Apr 14, 2023
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
2 changes: 1 addition & 1 deletion core/loadpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
7 changes: 1 addition & 6 deletions core/loadpoint_session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
5 changes: 2 additions & 3 deletions core/loadpoint_session_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
}