From d970fc94cbb683747eb4a350321cdd276eaaf62c Mon Sep 17 00:00:00 2001 From: andig Date: Mon, 19 Aug 2024 22:53:35 +0200 Subject: [PATCH] chore: clarify error messages --- core/loadpoint.go | 2 +- core/wrapper/chargerater.go | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/core/loadpoint.go b/core/loadpoint.go index 133d88db5..b69ce3193 100644 --- a/core/loadpoint.go +++ b/core/loadpoint.go @@ -1449,7 +1449,7 @@ func (lp *Loadpoint) updateChargeVoltages() { u1, u2, u3, err := phaseMeter.Voltages() if err != nil { - lp.log.ERROR.Printf("charge meter: %v", err) + lp.log.ERROR.Printf("charge voltages: %v", err) return } diff --git a/core/wrapper/chargerater.go b/core/wrapper/chargerater.go index a7a59ff4e..8e27d62fb 100644 --- a/core/wrapper/chargerater.go +++ b/core/wrapper/chargerater.go @@ -48,7 +48,7 @@ func (cr *ChargeRater) StartCharge(continued bool) { cr.startEnergy = f cr.log.DEBUG.Printf("charge start energy: %.3gkWh", f) } else { - cr.log.ERROR.Printf("charge meter: %v", err) + cr.log.ERROR.Printf("charge total import: %v", err) } } @@ -71,9 +71,9 @@ func (cr *ChargeRater) StopCharge() { if m, ok := cr.meter.(api.MeterEnergy); ok { if f, err := m.TotalEnergy(); err == nil { cr.chargedEnergy += f - cr.startEnergy - cr.log.DEBUG.Printf("final charge energy: %.3gkWh", cr.chargedEnergy) + cr.log.DEBUG.Printf("charge final energy: %.3gkWh", cr.chargedEnergy) } else { - cr.log.ERROR.Printf("charge meter error %v", err) + cr.log.ERROR.Printf("charge total import: %v", err) } } } @@ -110,12 +110,11 @@ func (cr *ChargeRater) ChargedEnergy() (float64, error) { // get current energy amount if m, ok := cr.meter.(api.MeterEnergy); ok { f, err := m.TotalEnergy() - if err == nil { return cr.chargedEnergy + f - cr.startEnergy, nil } - return 0, fmt.Errorf("charge meter error %v", err) + return 0, fmt.Errorf("charge total import: %v", err) } // return charged energy sofar if meter is not used