From f2217c0a4c6916c54dbba46aa255ccb3c332ef1a Mon Sep 17 00:00:00 2001 From: andig Date: Wed, 21 Sep 2022 11:07:13 +0200 Subject: [PATCH] Telemetry: log Wh instead of kWh --- core/site.go | 2 +- util/telemetry/charging.go | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/core/site.go b/core/site.go index 8cc9d4121..4485fe70d 100644 --- a/core/site.go +++ b/core/site.go @@ -454,7 +454,7 @@ func (site *Site) update(lp Updater) { // update savings and aggregate telemetry // TODO: use energy instead of current power for better results deltaCharged, deltaSelf := site.savings.Update(site, site.gridPower, site.pvPower, site.batteryPower, totalChargePower) - if totalChargePower > standbyPower { + if telemetry.Enabled && totalChargePower > standbyPower { go telemetry.ChargeProgress(site.log, totalChargePower, deltaCharged, deltaSelf) } } diff --git a/util/telemetry/charging.go b/util/telemetry/charging.go index 98f4722e4..8730201c4 100644 --- a/util/telemetry/charging.go +++ b/util/telemetry/charging.go @@ -12,7 +12,7 @@ import ( var ( api = "https://api.evcc.io" - enabled bool + Enabled bool ) func Create(token string) error { @@ -20,16 +20,12 @@ func Create(token string) error { return errors.New("telemetry requires sponsorship") } - enabled = true + Enabled = true return nil } func ChargeProgress(log *util.Logger, power, deltaCharged, deltaGreen float64) { - log.DEBUG.Printf("community: Δ%.0f/%.0fkWh @ %.0fW", deltaGreen, deltaCharged, power) - - if !enabled { - return - } + log.DEBUG.Printf("telemetry: charge: Δ%.0f/%.0fWh @ %.0fW", deltaGreen*1e3, deltaCharged*1e3, power) data := struct { ChargePower float64 `json:"chargePower"`