Automatically include Arduino_DebugUtils if any of the debug macros is actually defined, i.e. if any debug output is enabled on the platform.

Author: aentinger

src/AIoTC_Config.h

@@ -30,19 +30,6 @@
   #define NTP_USE_RANDOM_PORT     (1)
 #endif
 
-#if defined(ARDUINO_AVR_UNO_WIFI_REV2)
-/* Provide defines for constants provided within Arduino_DebugUtils
- * in order to allow older sketches using those constants to still
- * compile.
- */
-#  define DBG_NONE    -1
-#  define DBG_ERROR    0
-#  define DBG_WARNING  1
-#  define DBG_INFO     2
-#  define DBG_DEBUG    3
-#  define DBG_VERBOSE  4
-#endif
-
 #ifndef DEBUG_ERROR
 # if defined(ARDUINO_AVR_UNO_WIFI_REV2)
 #   define DEBUG_ERROR(fmt, ...)
@@ -83,6 +70,19 @@
 # endif
 #endif
 
+#if defined(ARDUINO_AVR_UNO_WIFI_REV2) && !(defined(DEBUG_ERROR) || defined(DEBUG_WARNING) || defined(DEBUG_INFO) || defined(DEBUG_DEBUG) || defined(DEBUG_VERBOSE))
+/* Provide defines for constants provided within Arduino_DebugUtils
+ * in order to allow older sketches using those constants to still
+ * compile.
+ */
+#  define DBG_NONE    -1
+#  define DBG_ERROR    0
+#  define DBG_WARNING  1
+#  define DBG_INFO     2
+#  define DBG_DEBUG    3
+#  define DBG_VERBOSE  4
+#endif
+
 /******************************************************************************
  * AUTOMATICALLY CONFIGURED DEFINES
  ******************************************************************************/

src/ArduinoIoTCloud.h

@@ -26,7 +26,7 @@
 
 #include <Arduino_ConnectionHandler.h>
 
-#if !defined(__AVR__)
+#if defined(DEBUG_ERROR) || defined(DEBUG_WARNING) || defined(DEBUG_INFO) || defined(DEBUG_DEBUG) || defined(DEBUG_VERBOSE)
 #  include <Arduino_DebugUtils.h>
 #endif