letscontrolit · TD-er · May 31, 2021 · May 29, 2021 · May 29, 2021 · May 30, 2021
diff --git a/src/_C001.ino b/src/_C001.ino
@@ -152,7 +152,8 @@ bool do_process_c001_delay_queue(int controller_number, const C001_queue_element
   String request = create_http_request_auth(controller_number, element.controller_idx, ControllerSettings, F("GET"), element.txt);
 
 # ifndef BUILD_NO_DEBUG
-  addLog(LOG_LEVEL_DEBUG, element.txt);
+  if (loglevelActiveFor(LOG_LEVEL_DEBUG))
+    addLog(LOG_LEVEL_DEBUG, element.txt);
 # endif // ifndef BUILD_NO_DEBUG
   return send_via_http(controller_number, client, request, ControllerSettings.MustCheckReply);
 }

diff --git a/src/_C002.ino b/src/_C002.ino
@@ -185,9 +185,11 @@ bool CPlugin_002(CPlugin::Function function, struct EventStruct *event, String&
       {
         String json = serializeDomoticzJson(event);
 # ifndef BUILD_NO_DEBUG
-        String log = F("MQTT : ");
-        log += json;
-        addLog(LOG_LEVEL_DEBUG, log);
+        if (loglevelActiveFor(LOG_LEVEL_DEBUG)) {
+          String log = F("MQTT : ");
+          log += json;
+          addLog(LOG_LEVEL_DEBUG, log);
+        }
 # endif // ifndef BUILD_NO_DEBUG
 
         String pubname = CPlugin_002_pubname;

diff --git a/src/_C008.ino b/src/_C008.ino
@@ -99,7 +99,8 @@ bool CPlugin_008(CPlugin::Function function, struct EventStruct *event, String&
             parseSingleControllerVariable(element.txt[x], event, x, true);
             element.txt[x].replace(F("%value%"), formattedValue);
 # ifndef BUILD_NO_DEBUG
-            addLog(LOG_LEVEL_DEBUG_MORE, element.txt[x]);
+            if (loglevelActiveFor(LOG_LEVEL_DEBUG_MORE))
+              addLog(LOG_LEVEL_DEBUG_MORE, element.txt[x]);
 # endif // ifndef BUILD_NO_DEBUG
           }
         }

diff --git a/src/_C010.ino b/src/_C010.ino
@@ -90,7 +90,8 @@ bool CPlugin_010(CPlugin::Function function, struct EventStruct *event, String&
             element.txt[x] = tmppubname;
             parseSingleControllerVariable(element.txt[x], event, x, false);
             element.txt[x].replace(F("%value%"), formattedValue);
-            addLog(LOG_LEVEL_DEBUG_MORE, element.txt[x]);
+            if (loglevelActiveFor(LOG_LEVEL_DEBUG_MORE))
+              addLog(LOG_LEVEL_DEBUG_MORE, element.txt[x]);
           }
         }
       }

diff --git a/src/_C011.ino b/src/_C011.ino
@@ -334,19 +334,25 @@ void ReplaceTokenByValue(String& s, struct EventStruct *event, bool sendBinary)
   // write?db=testdb&type=%1%%vname1%%/1%%2%;%vname2%%/2%%3%;%vname3%%/3%%4%;%vname4%%/4%&value=%1%%val1%%/1%%2%;%val2%%/2%%3%;%val3%%/3%%4%;%val4%%/4%
   //	%1%%vname1%,Standort=%tskname% Wert=%val1%%/1%%2%%LF%%vname2%,Standort=%tskname% Wert=%val2%%/2%%3%%LF%%vname3%,Standort=%tskname%
   //  Wert=%val3%%/3%%4%%LF%%vname4%,Standort=%tskname% Wert=%val4%%/4%
-  addLog(LOG_LEVEL_DEBUG_MORE, F("HTTP before parsing: "));
-  addLog(LOG_LEVEL_DEBUG_MORE, s);
+  if (loglevelActiveFor(LOG_LEVEL_DEBUG_MORE)) {
+    addLog(LOG_LEVEL_DEBUG_MORE, F("HTTP before parsing: "));
+    addLog(LOG_LEVEL_DEBUG_MORE, s);
+  }
   const byte valueCount = getValueCountForTask(event->TaskIndex);
 
   DeleteNotNeededValues(s, valueCount);
 
-  addLog(LOG_LEVEL_DEBUG_MORE, F("HTTP after parsing: "));
-  addLog(LOG_LEVEL_DEBUG_MORE, s);
+  if (loglevelActiveFor(LOG_LEVEL_DEBUG_MORE)) {
+    addLog(LOG_LEVEL_DEBUG_MORE, F("HTTP after parsing: "));
+    addLog(LOG_LEVEL_DEBUG_MORE, s);
+  }
 
   parseControllerVariables(s, event, !sendBinary);
 
-  addLog(LOG_LEVEL_DEBUG_MORE, F("HTTP after replacements: "));
-  addLog(LOG_LEVEL_DEBUG_MORE, s);
+  if (loglevelActiveFor(LOG_LEVEL_DEBUG_MORE)) {
+    addLog(LOG_LEVEL_DEBUG_MORE, F("HTTP after replacements: "));
+    addLog(LOG_LEVEL_DEBUG_MORE, s);
+  }
 }
 
 #endif // ifdef USES_C011
diff --git a/src/_C012.ino b/src/_C012.ino
@@ -70,7 +70,8 @@ bool CPlugin_012(CPlugin::Function function, struct EventStruct *event, String&
           element.txt[x] += event->idx + x;
           element.txt[x] += F("?value=");
           element.txt[x] += formattedValue;
-          addLog(LOG_LEVEL_DEBUG_MORE, element.txt[x]);
+          if (loglevelActiveFor(LOG_LEVEL_DEBUG_MORE))
+            addLog(LOG_LEVEL_DEBUG_MORE, element.txt[x]);
         }
       }
 

diff --git a/src/_C015.ino b/src/_C015.ino
@@ -193,25 +193,29 @@ bool CPlugin_015(CPlugin::Function function, struct EventStruct *event, String&
           valueFullName += valueName;
           String vPinNumberStr = valueName.substring(1, 4);
           int    vPinNumber    = vPinNumberStr.toInt();
-          String log           = F(C015_LOG_PREFIX);
-          log += Blynk.connected() ? F("(online): ") : F("(offline): ");
-
-          if ((vPinNumber > 0) && (vPinNumber < 256)) {
-            log += F("send ");
-            log += valueFullName;
-            log += F(" = ");
-            log += formattedValue;
-            log += F(" to blynk pin v");
-            log += vPinNumber;
-          }
-          else {
+
+          if (!(vPinNumber > 0) && (vPinNumber < 256)) {
             vPinNumber = -1;
-            log       += F("error got vPin number for ");
-            log       += valueFullName;
-            log       += F(", got not valid value: ");
-            log       += vPinNumberStr;
           }
-          addLog(LOG_LEVEL_INFO, log);
+          if (loglevelActiveFor(LOG_LEVEL_INFO)) {
+            String log           = F(C015_LOG_PREFIX);
+            log += Blynk.connected() ? F("(online): ") : F("(offline): ");
+
+            if ((vPinNumber > 0) && (vPinNumber < 256)) {
+              log += F("send ");
+              log += valueFullName;
+              log += F(" = ");
+              log += formattedValue;
+              log += F(" to blynk pin v");
+              log += vPinNumber;
+            } else {
+              log += F("error got vPin number for ");
+              log += valueFullName;
+              log += F(", got not valid value: ");
+              log += vPinNumberStr;
+            }
+            addLog(LOG_LEVEL_INFO, log);
+          }
           element.vPin[x] = vPinNumber;
           element.txt[x]  = formattedValue;
         }
@@ -286,11 +290,15 @@ boolean Blynk_keep_connection_c015(int controllerIndex, ControllerSettingsStruct
     LoadCustomControllerSettings(controllerIndex, (byte *)&thumbprint, sizeof(thumbprint));
 
     if (strlen(thumbprint) != 59) {
-      addLog(LOG_LEVEL_INFO, C015_LOG_PREFIX "Saved thumprint value is not correct:");
-      addLog(LOG_LEVEL_INFO, thumbprint);
+      if (loglevelActiveFor(LOG_LEVEL_INFO)) {
+        addLog(LOG_LEVEL_INFO, F(C015_LOG_PREFIX "Saved thumprint value is not correct:"));
+        addLog(LOG_LEVEL_INFO, thumbprint);
+      }
       strcpy(thumbprint, CPLUGIN_015_DEFAULT_THUMBPRINT);
-      addLog(LOG_LEVEL_INFO, C015_LOG_PREFIX "using default one:");
-      addLog(LOG_LEVEL_INFO, thumbprint);
+      if (loglevelActiveFor(LOG_LEVEL_INFO)) {
+        addLog(LOG_LEVEL_INFO, F(C015_LOG_PREFIX "using default one:"));
+        addLog(LOG_LEVEL_INFO, thumbprint);
+      }
     }
     # endif // ifdef CPLUGIN_015_SSL
 
@@ -390,12 +398,14 @@ String Command_Blynk_Set_c015(struct EventStruct *event, const char *Line) {
     return err;
   }
 
-  String log = F(C015_LOG_PREFIX "(online): send blynk pin v");
+  if (loglevelActiveFor(LOG_LEVEL_INFO)) {
+    String log = F(C015_LOG_PREFIX "(online): send blynk pin v");
 
-  log += vPin;
-  log += F(" = ");
-  log += data;
-  addLog(LOG_LEVEL_INFO, log);
+    log += vPin;
+    log += F(" = ");
+    log += data;
+    addLog(LOG_LEVEL_INFO, log);
+  }
 
   Blynk.virtualWrite(vPin, data);
   return return_command_success();

diff --git a/src/_C018.ino b/src/_C018.ino
@@ -325,16 +325,18 @@ struct C018_data_struct {
 private:
 
   void C018_logError(const String& command) const {
-    String error = myLora->peekLastError();
+    if (loglevelActiveFor(LOG_LEVEL_INFO)) {
+      String error = myLora->peekLastError();
 
-    //    String error = myLora->getLastError();
+      //    String error = myLora->getLastError();
 
-    if (error.length() > 0) {
-      String log = F("RN2483: ");
-      log += command;
-      log += ": ";
-      log += error;
-      addLog(LOG_LEVEL_INFO, log);
+      if (error.length() > 0) {
+        String log = F("RN2483: ");
+        log += command;
+        log += ": ";
+        log += error;
+        addLog(LOG_LEVEL_INFO, log);
+      }
     }
   }
 
@@ -869,14 +871,16 @@ bool C018_init(struct EventStruct *event) {
   }
 
   if (customConfig->joinmethod == C018_USE_OTAA) {
-    String log = F("OTAA: AppEUI: ");
-    log += AppEUI;
-    log += F(" AppKey: ");
-    log += AppKey;
-    log += F(" DevEUI: ");
-    log += customConfig->DeviceEUI;
+    if (loglevelActiveFor(LOG_LEVEL_INFO)) {
+      String log = F("OTAA: AppEUI: ");
+      log += AppEUI;
+      log += F(" AppKey: ");
+      log += AppKey;
+      log += F(" DevEUI: ");
+      log += customConfig->DeviceEUI;
 
-    addLog(LOG_LEVEL_INFO, log);
+      addLog(LOG_LEVEL_INFO, log);
+    }
 
     if (!C018_data->initOTAA(AppEUI, AppKey, customConfig->DeviceEUI)) {
       return false;

diff --git a/src/_N001_Email.ino b/src/_N001_Email.ino
@@ -96,9 +96,11 @@ boolean NPlugin_001_send(const NotificationSettingsStruct& notificationsettings,
 	WiFiClient client;
 	client.setTimeout(CONTROLLER_CLIENTTIMEOUT_DFLT);
 	String aHost = notificationsettings.Server;
-	addLog(LOG_LEVEL_DEBUG, String(F("EMAIL: Connecting to ")) + aHost + notificationsettings.Port);
+	if (loglevelActiveFor(LOG_LEVEL_DEBUG))
+		addLog(LOG_LEVEL_DEBUG, String(F("EMAIL: Connecting to ")) + aHost + notificationsettings.Port);
 	if (!connectClient(client, aHost.c_str(), notificationsettings.Port, CONTROLLER_CLIENTTIMEOUT_DFLT)) {
-		addLog(LOG_LEVEL_ERROR, String(F("EMAIL: Error connecting to ")) + aHost + notificationsettings.Port);
+		if (loglevelActiveFor(LOG_LEVEL_ERROR))
+			addLog(LOG_LEVEL_ERROR, String(F("EMAIL: Error connecting to ")) + aHost + notificationsettings.Port);
 		myStatus = false;
 	}else {
 		String mailheader = F(
@@ -154,7 +156,8 @@ boolean NPlugin_001_send(const NotificationSettingsStruct& notificationsettings,
 			while (nextAddressAvailable) {
 				String mailFound = F("Email: To ");
 				mailFound += emailTo;
-				addLog(LOG_LEVEL_INFO, mailFound);
+				if (loglevelActiveFor(LOG_LEVEL_INFO))
+					addLog(LOG_LEVEL_INFO, mailFound);
 				if (!NPlugin_001_MTA(client, String(F("RCPT TO:<")) + emailTo + ">", F("250 "))) break;
 				++i;
 				nextAddressAvailable = getNextMailAddress(notificationsettings.Receiver, emailTo, i);
@@ -173,9 +176,11 @@ boolean NPlugin_001_send(const NotificationSettingsStruct& notificationsettings,
 		if (myStatus == true) {
 			addLog(LOG_LEVEL_INFO, F("EMAIL: Connection Closed Successfully"));
 		}else {
-			String log = F("EMAIL: Connection Closed With Error. Used header: ");
-			log += mailheader;
-			addLog(LOG_LEVEL_ERROR, log);
+			if (loglevelActiveFor(LOG_LEVEL_ERROR)) {
+				String log = F("EMAIL: Connection Closed With Error. Used header: ");
+				log += mailheader;
+				addLog(LOG_LEVEL_ERROR, log);
+			}
 		}
 	}
 	return myStatus;
@@ -202,7 +207,8 @@ boolean NPlugin_001_Auth(WiFiClient& client, const String& user, const String& p
 
 boolean NPlugin_001_MTA(WiFiClient& client, const String& aStr, const String &aWaitForPattern)
 {
-	addLog(LOG_LEVEL_DEBUG, aStr);
+	if (loglevelActiveFor(LOG_LEVEL_DEBUG))
+		addLog(LOG_LEVEL_DEBUG, aStr);
 
 	if (aStr.length()) client.println(aStr);
 
@@ -211,9 +217,11 @@ boolean NPlugin_001_MTA(WiFiClient& client, const String& aStr, const String &aW
 	backgroundtasks();
 	while (true) {
 		if (timeOutReached(timer)) {
-			String log = F("NPlugin_001_MTA: timeout. ");
-			log += aStr;
-			addLog(LOG_LEVEL_ERROR, log);
+			if (loglevelActiveFor(LOG_LEVEL_ERROR)) {
+				String log = F("NPlugin_001_MTA: timeout. ");
+				log += aStr;
+				addLog(LOG_LEVEL_ERROR, log);
+			}
 			return false;
 		}
 
@@ -223,7 +231,8 @@ boolean NPlugin_001_MTA(WiFiClient& client, const String& aStr, const String &aW
 		String line;
 		safeReadStringUntil(client, line, '\n');
 
-		addLog(LOG_LEVEL_DEBUG, line);
+        if (loglevelActiveFor(LOG_LEVEL_DEBUG))
+			addLog(LOG_LEVEL_DEBUG, line);
 
 		if (line.indexOf(aWaitForPattern) >= 0) {
 			return true;

diff --git a/src/_P007_PCF8591.ino b/src/_P007_PCF8591.ino
@@ -65,9 +65,11 @@ boolean Plugin_007(byte function, struct EventStruct *event, String& string)
       {
         Wire.read();                                       // Read older value first (stored in chip)
         UserVar[event->BaseVarIndex] = (float)Wire.read(); // now read actual value and store into Nodo var
-        String log = F("PCF  : Analog value: ");
-        log += formatUserVarNoCheck(event->TaskIndex, 0);
-        addLog(LOG_LEVEL_INFO, log);
+        if (loglevelActiveFor(LOG_LEVEL_INFO)) {
+          String log = F("PCF  : Analog value: ");
+          log += formatUserVarNoCheck(event->TaskIndex, 0);
+          addLog(LOG_LEVEL_INFO, log);
+        }
         success = true;
       }
       break;

diff --git a/src/_P008_RFID.ino b/src/_P008_RFID.ino
@@ -144,9 +144,11 @@ boolean Plugin_008(byte function, struct EventStruct *event, String& string)
               Plugin_008_timeoutCount++;
               if (Plugin_008_timeoutCount > 5)
               {
-                String log = F("RFID : reset bits: ");
-                log += Plugin_008_bitCount;
-                addLog(LOG_LEVEL_INFO, log );
+                if (loglevelActiveFor(LOG_LEVEL_INFO)) {
+                  String log = F("RFID : reset bits: ");
+                  log += Plugin_008_bitCount;
+                  addLog(LOG_LEVEL_INFO, log );
+                }
                 // reset after ~5 sec
                 Plugin_008_keyBuffer = 0;
                 Plugin_008_bitCount = 0;

diff --git a/src/_P009_MCP.ino b/src/_P009_MCP.ino
@@ -203,7 +203,11 @@ boolean Plugin_009(byte function, struct EventStruct *event, String& string)
         // read and store current state to prevent switching at boot time
         // "state" could be -1, 0 or 1
         newStatus.state                          = GPIO_MCP_Read(CONFIG_PORT);
-addLog(LOG_LEVEL_INFO,"MCP INIT="+String(newStatus.state));        
+        if (loglevelActiveFor(LOG_LEVEL_INFO)) {
+          String log = F("MCP INIT=");
+          log += newStatus.state;
+          addLog(LOG_LEVEL_INFO,log);
+        }
         newStatus.output                         = newStatus.state;
         (newStatus.state == -1) ? newStatus.mode = PIN_MODE_OFFLINE : newStatus.mode = PIN_MODE_INPUT_PULLUP; // @giig1967g: if it is in the
                                                                                                               // device list we assume it's

diff --git a/src/_P010_BH1750.ino b/src/_P010_BH1750.ino
@@ -123,13 +123,15 @@ boolean Plugin_010(byte function, struct EventStruct *event, String& string)
 
       if (lux != -1) {
         UserVar[event->BaseVarIndex] = lux;
-        String log = F("BH1750 Address: 0x");
-        log += String(address, HEX);
-        log += F(" Mode: 0x");
-        log += String(mode);
-        log += F(" : Light intensity: ");
-        log += formatUserVarNoCheck(event->TaskIndex, 0);
-        addLog(LOG_LEVEL_INFO, log);
+        if (loglevelActiveFor(LOG_LEVEL_INFO)) {
+          String log = F("BH1750 Address: 0x");
+          log += String(address, HEX);
+          log += F(" Mode: 0x");
+          log += String(mode);
+          log += F(" : Light intensity: ");
+          log += formatUserVarNoCheck(event->TaskIndex, 0);
+          addLog(LOG_LEVEL_INFO, log);
+        }
         success = true;
       }
       break;