From 692dd6628c87810428b4e1286dc52cdf6f16749c Mon Sep 17 00:00:00 2001
From: DanielR92 <DanielR92@users.noreply.github.com>
Date: Sat, 30 Mar 2024 18:25:00 +0100
Subject: [PATCH] little changes

---
 src/config/settings.h               |  2 +-
 src/plugins/zeroExport/powermeter.h | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/config/settings.h b/src/config/settings.h
index 1b70161b..7458aa1f 100644
--- a/src/config/settings.h
+++ b/src/config/settings.h
@@ -188,7 +188,7 @@ typedef struct {
 // Plugin ZeroExport
 #if defined(PLUGIN_ZEROEXPORT)
 
-#define ZEROEXPORT_DEV_POWERMETER
+//#define ZEROEXPORT_DEV_POWERMETER
 #define ZEROEXPORT_MAX_GROUPS                       6
 #define ZEROEXPORT_GROUP_MAX_LEN_NAME              25
 #define ZEROEXPORT_GROUP_MAX_LEN_PM_URL           100
diff --git a/src/plugins/zeroExport/powermeter.h b/src/plugins/zeroExport/powermeter.h
index 792404eb..6ca1280a 100644
--- a/src/plugins/zeroExport/powermeter.h
+++ b/src/plugins/zeroExport/powermeter.h
@@ -433,6 +433,7 @@ class powermeter {
         bool result = false;
 
         if(millis() - previousMillis <= 3000) return false; // skip when it is to fast
+        logObj["mod"] = "getPowermeterWattsTibber";
 
         mCfg->groups[group].pmPower = 0;
         mCfg->groups[group].pmPowerL1 = 0;
@@ -455,11 +456,9 @@ class powermeter {
 
         if (http.GET() == HTTP_CODE_OK && http.getSize() > 0) {
             String myString = http.getString();
-
-            char floatBuffer[20];
             double readVal = 0;
-
             unsigned char c;
+
             for (int i = 0; i < http.getSize(); ++i) {
                 c = myString[i];
                 sml_states_t smlCurrentState = smlState(c);
@@ -472,11 +471,8 @@ class powermeter {
                         mCfg->groups[group].pmPowerL2 = _powerMeter2Power;
                         mCfg->groups[group].pmPowerL3 = _powerMeter3Power;
 
-                        if(! (_powerMeter1Power && _powerMeter2Power && _powerMeter3Power))
-                        {
-                            mCfg->groups[group].pmPowerL1 = _powerMeterTotal / 3;
-                            mCfg->groups[group].pmPowerL2 = _powerMeterTotal / 3;
-                            mCfg->groups[group].pmPowerL3 = _powerMeterTotal / 3;
+                        if(! (_powerMeter1Power && _powerMeter2Power && _powerMeter3Power)) {
+                            mCfg->groups[group].pmPowerL1 = mCfg->groups[group].pmPowerL2 = mCfg->groups[group].pmPowerL3 = _powerMeterTotal / 3;
                         }
 
                         result = true;