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

Jump to bottom

Sessions: add odometer #5069

Merged
merged 4 commits into from
Nov 7, 2022
Merged

Sessions: add odometer #5069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
09c9367
Sessions: add odometer
andig Nov 6, 2022
6693ea7
wip
andig Nov 6, 2022
22b65ee
Make updates more flexible
andig Nov 7, 2022
0b035e0
UI
andig Nov 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions assets/i18n/de.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ title = "Ladevorgänge"
downloadCsv = "Als CSV herunterladen"
loadpoint = "Ladepunkt"
vehicle = "Fahrzeug"
odometer = "Kilometerstand"
energy = "Geladen"
date = "Zeitraum"

Expand Down
1 change: 1 addition & 0 deletions assets/i18n/en.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ date = "Period"
[sessions.csv]
loadpoint = "Loadpoint"
vehicle = "Vehicle"
odometer = "Mileage (km)"
identifier = "Identifier"
chargedenergy = "Energy (kWh)"
meterstart = "Meter Start (kWh)"
Expand Down
1 change: 1 addition & 0 deletions core/db/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ type Session struct {
Loadpoint string `json:"loadpoint"`
Identifier string `json:"identifier"`
Vehicle string `json:"vehicle"`
Odometer float64 `json:"odometer"`
MeterStart float64 `json:"meterStart" csv:"Meter Start (kWh)" gorm:"column:meter_start_kwh"`
MeterStop float64 `json:"meterStop" csv:"Meter Stop (kWh)" gorm:"column:meter_end_kwh"`
ChargedEnergy float64 `json:"chargedEnergy" csv:"Charged Energy (kWh)" gorm:"column:charged_kwh"`
Expand Down
15 changes: 14 additions & 1 deletion core/loadpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -905,7 +905,15 @@ func (lp *LoadPoint) setActiveVehicle(vehicle api.Vehicle) {
lp.Lock()

lp.unpublishVehicle()
lp.updateSession()

lp.updateSession(func(session *db.Session) {
var title string
if lp.vehicle != nil {
title = lp.vehicle.Title()
}

lp.session.Vehicle = title
})
}

func (lp *LoadPoint) wakeUpVehicle() {
Expand Down Expand Up @@ -1039,6 +1047,11 @@ func (lp *LoadPoint) vehicleOdometer() {
if odo, err := vs.Odometer(); err == nil {
lp.log.DEBUG.Printf("vehicle odometer: %.0fkm", odo)
lp.publish(vehicleOdometer, odo)

// update session once odometer is read
lp.updateSession(func(session *db.Session) {
session.Odometer = odo
})
} else {
lp.log.ERROR.Printf("vehicle odometer: %v", err)
}
Expand Down
15 changes: 7 additions & 8 deletions core/loadpoint_database.go → core/loadpoint_session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package core

import (
"github.com/evcc-io/evcc/api"
"github.com/evcc-io/evcc/core/db"
)

func (lp *LoadPoint) chargeMeterTotal() float64 {
Expand Down Expand Up @@ -53,21 +54,19 @@ func (lp *LoadPoint) stopSession() {
lp.db.Persist(lp.session)
}

func (lp *LoadPoint) updateSession() {
type sessionOption func(*db.Session)

func (lp *LoadPoint) updateSession(opts ...sessionOption) {
// test guard
if lp.db == nil || lp.session == nil {
return
}

var title string
if lp.vehicle != nil {
title = lp.vehicle.Title()
for _, opt := range opts {
opt(lp.session)
}

if lp.session.Vehicle != title {
lp.session.Vehicle = title
lp.db.Persist(lp.session)
}
lp.db.Persist(lp.session)
}

func (lp *LoadPoint) finalizeSession() {
Expand Down
2 changes: 1 addition & 1 deletion dist/assets/index.2e41d610.js → dist/assets/index.3dafc84f.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<meta name="theme-color" content="#020318" />

<title>evcc</title>
<script type="module" crossorigin src="./assets/index.2e41d610.js"></script>
<script type="module" crossorigin src="./assets/index.3dafc84f.js"></script>
<link rel="stylesheet" href="./assets/index.ab3ceb62.css">
</head>

Expand Down