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

Loadpoint: publish vehicleTitle again (#21720)

Browse source
This commit is contained in:
andig 2025-06-08 16:44:04 +02:00 • committed by GitHub
parent 665d9198f1
commit c65f1acd5a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/keys/loadpoint.go
View file

@ -24,7 +24,7 @@ const (
BatteryBoost = "batteryBoost"
PhasesConfigured = "phasesConfigured" // desired phase mode (0/1/3, 0 = automatic), user selection
PhasesActive = "phasesActive" // active phases as used by vehicle (1/2/3)
PhasesActive = "phasesActive" // expectedly active phases, taking vehicle into account (1/2/3)
ChargerIcon = "chargerIcon" // charger icon for ui
ChargerFeature = "chargerFeature" // charger feature
@ -86,6 +86,7 @@ const (
// vehicle
VehicleName = "vehicleName" // vehicle name
VehicleTitle = "vehicleTitle" // vehicle title
VehicleIdentity = "vehicleIdentity" // vehicle identity
VehicleDetectionActive = "vehicleDetectionActive" // vehicle detection active
VehicleOdometer = "vehicleOdometer" // vehicle odometer

4
core/loadpoint.go
View file

@ -648,8 +648,8 @@ func (lp *Loadpoint) Prepare(site site.API, uiChan chan<- util.Param, pushChan c
}
// vehicle
lp.publish(keys.VehicleName, "")
lp.publish(keys.VehicleOdometer, 0.0)
lp.unpublishVehicleIdentity()
lp.unpublishVehicle()
// assign and publish default vehicle
if lp.defaultVehicle != nil {

12
core/loadpoint_vehicle.go
View file

@ -141,6 +141,7 @@ func (lp *Loadpoint) setActiveVehicle(v api.Vehicle) {
lp.socEstimator = soc.NewEstimator(lp.log, lp.charger, v, estimate)
lp.publish(keys.VehicleName, vehicle.Settings(lp.log, v).Name())
lp.publish(keys.VehicleTitle, v.Title())
if mode, ok := v.OnIdentified().GetMode(); ok {
lp.SetMode(mode)
@ -151,9 +152,7 @@ func (lp *Loadpoint) setActiveVehicle(v api.Vehicle) {
lp.progress.Reset()
} else {
lp.socEstimator = nil
lp.publish(keys.VehicleSoc, 0)
lp.publish(keys.VehicleName, "")
lp.publish(keys.VehicleOdometer, 0.0)
lp.unpublishVehicleIdentity()
}
// re-publish vehicle settings
@ -198,6 +197,12 @@ func (lp *Loadpoint) wakeUpResurrector(resurrector api.Resurrector, name string)
}
}
// unpublishVehicleIdentity resets published vehicle identification
func (lp *Loadpoint) unpublishVehicleIdentity() {
lp.publish(keys.VehicleName, "")
lp.publish(keys.VehicleTitle, "")
}
// unpublishVehicle resets published vehicle data
func (lp *Loadpoint) unpublishVehicle() {
lp.vehicleSoc = 0
@ -206,6 +211,7 @@ func (lp *Loadpoint) unpublishVehicle() {
lp.publish(keys.VehicleSoc, 0.0)
lp.publish(keys.VehicleRange, int64(0))
lp.publish(keys.VehicleLimitSoc, 0.0)
lp.publish(keys.VehicleOdometer, 0.0)
lp.setRemainingEnergy(0)
lp.setRemainingDuration(0)