0.8.1230003

src/defines.h

@@ -13,7 +13,7 @@
 //-------------------------------------
 #define VERSION_MAJOR       0
 #define VERSION_MINOR       8
-#define VERSION_PATCH       1230002
+#define VERSION_PATCH       1230003
 //-------------------------------------
 typedef struct {
     uint8_t ch;

src/plugins/zeroExport/zeroExport.h

@@ -14,7 +14,6 @@
 
 #include "AsyncJson.h"
 #include "powermeter.h"
-
 #include "utils/DynamicJsonHandler.h"
 
 template <class HMSYSTEM>
@@ -52,7 +51,6 @@ class ZeroExport {
         mIsInitialized = mPowermeter.setup(mApp, mCfg, mqtt, &_log);
     }
 
-
     /*void printJson() {
         serializeJson(doc, Serial);
         Serial.println();
@@ -93,8 +91,7 @@ class ZeroExport {
         Inverter<> *iv = mSys->getInverterByPos(Queue.id);
         if (NULL == iv) return;
 
-        if(!CfgGroup->battSwitch && !CfgGroup->battSwitchInit)
-        {
+        if (!CfgGroup->battSwitch && !CfgGroup->battSwitchInit) {
             if (!iv->alarmCnt) return;
             bool stb_flag = false;
 
@@ -152,7 +149,6 @@ class ZeroExport {
         _log.addProperty("gL", groupLimit);
         // Wird nur zum debuggen benötigt?
 
-
         // Batteryprotection
         _log.addProperty("bEn", (uint8_t)CfgGroup->battCfg);
 
@@ -649,7 +645,7 @@ class ZeroExport {
 
         mPowermeter.onMqttConnect();
 
-        // "topic":"userdefined battSoCTopic"
+        // "topic":"userdefined battSoCTopic" oder "userdefinedUTopic"
         for (uint8_t group = 0; group < ZEROEXPORT_MAX_GROUPS; group++) {
             if (!mCfg->groups[group].enabled) continue;
 
@@ -673,7 +669,7 @@ class ZeroExport {
 
         String topic = String(obj["topic"]);
 
-        // "topic":"userdefined battSoCTopic"
+        // "topic":"userdefined battSoCTopic" oder "userdefinedUTopic"
         for (uint8_t group = 0; group < ZEROEXPORT_MAX_GROUPS; group++) {
             if (!mCfg->groups[group].enabled) continue;
 
@@ -684,7 +680,6 @@ class ZeroExport {
             if (strcmp(mCfg->groups[group].battTopic, String(topic).c_str())) {
                 mCfg->groups[group].battValue = (bool)obj["val"];
 
-
                 _log.addProperty("k", mCfg->groups[group].battTopic);
                 _log.addProperty("v", mCfg->groups[group].battValue);
             }
@@ -693,7 +688,6 @@ class ZeroExport {
         // "topic":"ctrl/zero"
         if (topic.indexOf("ctrl/zero") == -1) return;
 
-
         _log.addProperty("d", obj);
 
         if (obj["path"] == "ctrl" && obj["cmd"] == "zero") {
@@ -721,8 +715,7 @@ class ZeroExport {
                 mCfg->sleep = (bool)obj["val"];
             }
 
-            else if ((topicGroup >= 0) && (topicGroup < ZEROEXPORT_MAX_GROUPS))
-            {
+            else if ((topicGroup >= 0) && (topicGroup < ZEROEXPORT_MAX_GROUPS)) {
                 String stopicGroup = String(topicGroup);
 
                 // "topic":"ctrl/zero/groups/+/enabled"
@@ -765,8 +758,7 @@ class ZeroExport {
                     mCfg->groups[topicGroup].battSwitch = (bool)obj["val"];
                 }
 
-                else if (topic.indexOf("/advanced/") != -1)
-                {
+                else if (topic.indexOf("/advanced/") != -1) {
                     // "topic":"ctrl/zero/groups/+/advanced/setPoint"
                     if (topic.endsWith("/setPoint")) {
                         _log.addProperty("v", (int16_t)obj["val"]);
@@ -784,11 +776,8 @@ class ZeroExport {
                         _log.addProperty("v", (uint16_t)obj["val"]);
                         mCfg->groups[topicGroup].powerMax = (uint16_t)obj["val"];
                     }
-                }
-                else if (topic.indexOf("/inverter/") != -1)
-                {
-                    if ((topicInverter >= 0) && (topicInverter < ZEROEXPORT_GROUP_MAX_INVERTERS))
-                    {
+                } else if (topic.indexOf("/inverter/") != -1) {
+                    if ((topicInverter >= 0) && (topicInverter < ZEROEXPORT_GROUP_MAX_INVERTERS)) {
                         // "topic":"ctrl/zero/groups/+/inverter/+/enabled"
                         if (topic.endsWith("/enabled")) {
                             _log.addProperty("v", (bool)obj["val"]);
@@ -804,14 +793,11 @@ class ZeroExport {
                         else if (topic.endsWith("/powerMax")) {
                             _log.addProperty("v", (uint16_t)obj["val"]);
                             mCfg->groups[topicGroup].inverters[topicInverter].powerMax = (uint16_t)obj["val"];
-                        }
-                        else
-                        {
+                        } else {
                             _log.addProperty("k", "error");
                         }
                     }
-                }
-                else {
+                } else {
                     _log.addProperty("k", "error");
                 }
             }