From ae853058c8bef7921e9b01985f3db5ae123e1129 Mon Sep 17 00:00:00 2001
From: premultiply <4681172+premultiply@users.noreply.github.com>
Date: Tue, 14 Jan 2025 09:36:25 +0100
Subject: [PATCH] OCPP: accept custom meter values even if configuration fails
 (#18217)

---
 charger/ocpp/cp_setup.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/charger/ocpp/cp_setup.go b/charger/ocpp/cp_setup.go
index f85902362..44488d4aa 100644
--- a/charger/ocpp/cp_setup.go
+++ b/charger/ocpp/cp_setup.go
@@ -125,11 +125,10 @@ func (cp *CP) Setup(meterValues string, meterInterval time.Duration) error {
 
 	// configure measurands
 	if meterValues != "" {
-		if err := cp.ChangeConfigurationRequest(KeyMeterValuesSampledData, meterValues); err == nil || meterValues == "disable" {
-			cp.meterValuesSample = meterValues
-		} else {
+		if err := cp.ChangeConfigurationRequest(KeyMeterValuesSampledData, meterValues); err != nil {
 			cp.log.WARN.Printf("failed configuring %s: %v", KeyMeterValuesSampledData, err)
 		}
+		cp.meterValuesSample = meterValues
 	}
 
 	// trigger initial meter values