From 502c6be7b67a3d2607fe272982b61641e9814dad Mon Sep 17 00:00:00 2001 From: andig Date: Mon, 23 Sep 2024 09:36:57 +0200 Subject: [PATCH] Loadpoint: don't error odometer if vehicle asleep --- core/loadpoint/error.go | 7 ++++++- core/loadpoint_vehicle.go | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/core/loadpoint/error.go b/core/loadpoint/error.go index 4fc7b267da..b885cce8a5 100644 --- a/core/loadpoint/error.go +++ b/core/loadpoint/error.go @@ -7,5 +7,10 @@ import ( ) func AcceptableError(err error) bool { - return errors.Is(err, api.ErrAsleep) || errors.Is(err, api.ErrMustRetry) + for _, e := range []error{api.ErrAsleep, api.ErrMustRetry, api.ErrNotAvailable} { + if errors.Is(err, e) { + return true + } + } + return false } diff --git a/core/loadpoint_vehicle.go b/core/loadpoint_vehicle.go index c2afa4caf8..d758a3f89d 100644 --- a/core/loadpoint_vehicle.go +++ b/core/loadpoint_vehicle.go @@ -9,6 +9,7 @@ import ( "github.com/evcc-io/evcc/api" "github.com/evcc-io/evcc/core/keys" + "github.com/evcc-io/evcc/core/loadpoint" "github.com/evcc-io/evcc/core/session" "github.com/evcc-io/evcc/core/soc" "github.com/evcc-io/evcc/core/vehicle" @@ -304,7 +305,7 @@ func (lp *Loadpoint) vehicleOdometer() { lp.updateSession(func(session *session.Session) { session.Odometer = &odo }) - } else if !errors.Is(err, api.ErrNotAvailable) { + } else if !loadpoint.AcceptableError(err) { lp.log.ERROR.Printf("vehicle odometer: %v", err) } }