Merge pull request #39 from soylentOrange/ESPCONNECT_NO_LOGGING

Update logic for logging

Author: mathieucarbou

platformio.ini

@@ -16,7 +16,10 @@ build_flags =
   -Wall -Wextra
   -D CONFIG_ARDUHAL_LOG_COLORS
   -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
-  -D ESPCONNECT_DEBUG
+  ; ------------------------------
+  ; Logging ON by default
+  ; -D ESPCONNECT_NO_LOGGING
+  ; ------------------------------
   -D NVS_LOG
   ; -H -M
   ; -D HTTPCLIENT_NOSECURE

src/MycilaESPConnect.cpp

@@ -44,41 +44,39 @@
   #include "./espconnect_webpage.h"
 #endif
 
-#ifdef MYCILA_LOGGER_SUPPORT
+#ifdef ESPCONNECT_NO_LOGGING
+  #define LOGD(tag, format, ...)
+  #define LOGI(tag, format, ...)
+  #define LOGW(tag, format, ...)
+  #define LOGE(tag, format, ...)
+#elif defined(MYCILA_LOGGER_SUPPORT)
   #include <MycilaLogger.h>
 extern Mycila::Logger logger;
   #define LOGD(tag, format, ...) logger.debug(tag, format, ##__VA_ARGS__)
   #define LOGI(tag, format, ...) logger.info(tag, format, ##__VA_ARGS__)
   #define LOGW(tag, format, ...) logger.warn(tag, format, ##__VA_ARGS__)
   #define LOGE(tag, format, ...) logger.error(tag, format, ##__VA_ARGS__)
 #elif defined(ESP8266)
-  #ifdef ESPCONNECT_DEBUG
-    #define LOGD(tag, format, ...)                         \
-      {                                                    \
-        Serial.printf("%6lu [%s] DEBUG: ", millis(), tag); \
-        Serial.printf(format "\n", ##__VA_ARGS__);         \
-      }
-    #define LOGI(tag, format, ...)                        \
-      {                                                   \
-        Serial.printf("%6lu [%s] INFO: ", millis(), tag); \
-        Serial.printf(format "\n", ##__VA_ARGS__);        \
-      }
-    #define LOGW(tag, format, ...)                        \
-      {                                                   \
-        Serial.printf("%6lu [%s] WARN: ", millis(), tag); \
-        Serial.printf(format "\n", ##__VA_ARGS__);        \
-      }
-    #define LOGE(tag, format, ...)                         \
-      {                                                    \
-        Serial.printf("%6lu [%s] ERROR: ", millis(), tag); \
-        Serial.printf(format "\n", ##__VA_ARGS__);         \
-      }
-  #else
-    #define LOGD(tag, format, ...)
-    #define LOGI(tag, format, ...)
-    #define LOGW(tag, format, ...)
-    #define LOGE(tag, format, ...)
-  #endif
+  #define LOGD(tag, format, ...)                         \
+    {                                                    \
+      Serial.printf("%6lu [%s] DEBUG: ", millis(), tag); \
+      Serial.printf(format "\n", ##__VA_ARGS__);         \
+    }
+  #define LOGI(tag, format, ...)                        \
+    {                                                   \
+      Serial.printf("%6lu [%s] INFO: ", millis(), tag); \
+      Serial.printf(format "\n", ##__VA_ARGS__);        \
+    }
+  #define LOGW(tag, format, ...)                        \
+    {                                                   \
+      Serial.printf("%6lu [%s] WARN: ", millis(), tag); \
+      Serial.printf(format "\n", ##__VA_ARGS__);        \
+    }
+  #define LOGE(tag, format, ...)                         \
+    {                                                    \
+      Serial.printf("%6lu [%s] ERROR: ", millis(), tag); \
+      Serial.printf(format "\n", ##__VA_ARGS__);         \
+    }
 #else
   #define LOGD(tag, format, ...) ESP_LOGD(tag, format, ##__VA_ARGS__)
   #define LOGI(tag, format, ...) ESP_LOGI(tag, format, ##__VA_ARGS__)