Renaming all 'DBG_ERROR/WARNING/INFO/DEBUG/VERBOSE macros to DEBUG_ERROR/WARNING/... to avoid name clashes with ídentically named constants within Arduino_DebugUtils

Author: aentinger

src/AIoTC_Config.h

@@ -31,31 +31,31 @@
 #endif
 
 #if defined(ARDUINO_AVR_UNO_WIFI_REV2)
-#define DBG_ERROR
-#define DBG_WARNING
-#define DBG_INFO
-#define DBG_DEBUG
-#define DBG_VERBOSE
+#define DEBUG_ERROR
+#define DEBUG_WARNING
+#define DEBUG_INFO
+#define DEBUG_DEBUG
+#define DEBUG_VERBOSE
 #endif
 
-#ifndef DBG_ERROR
-  #define DBG_ERROR(fmt, ...) Debug.print(DBG_ERROR, fmt, ## __VA_ARGS__)
+#ifndef DEBUG_ERROR
+  #define DEBUG_ERROR(fmt, ...) Debug.print(DBG_ERROR, fmt, ## __VA_ARGS__)
 #endif
 
-#ifndef DBG_WARNING
-  #define DBG_WARNING(fmt, ...) Debug.print(DBG_WARNING, fmt, ## __VA_ARGS__)
+#ifndef DEBUG_WARNING
+  #define DEBUG_WARNING(fmt, ...) Debug.print(DBG_WARNING, fmt, ## __VA_ARGS__)
 #endif
 
-#ifndef DBG_INFO
-  #define DBG_INFO(fmt, ...) Debug.print(DBG_INFO, fmt, ## __VA_ARGS__)
+#ifndef DEBUG_INFO
+  #define DEBUG_INFO(fmt, ...) Debug.print(DBG_INFO, fmt, ## __VA_ARGS__)
 #endif
 
-#ifndef DBG_DEBUG
-  #define DBG_DEBUG(fmt, ...) Debug.print(DBG_DEBUG, fmt, ## __VA_ARGS__)
+#ifndef DEBUG_DEBUG
+  #define DEBUG_DEBUG(fmt, ...) Debug.print(DBG_DEBUG, fmt, ## __VA_ARGS__)
 #endif
 
-#ifndef DBG_VERBOSE
-  #define DBG_VERBOSE(fmt, ...) //Debug.print(DBG_VERBOSE, fmt, ## __VA_ARGS__)
+#ifndef DEBUG_VERBOSE
+  #define DEBUG_VERBOSE(fmt, ...) //Debug.print(DBG_VERBOSE, fmt, ## __VA_ARGS__)
 #endif
 
 /******************************************************************************

src/ArduinoIoTCloudLPWAN.cpp

@@ -87,8 +87,8 @@ void ArduinoIoTCloudLPWAN::update()
 
 void ArduinoIoTCloudLPWAN::printDebugInfo()
 {
-  DBG_INFO(F("***** Arduino IoT Cloud LPWAN - configuration info *****"));
-  DBG_INFO(F("Thing ID: %s"), getThingId().c_str());
+  DEBUG_INFO(F("***** Arduino IoT Cloud LPWAN - configuration info *****"));
+  DEBUG_INFO(F("Thing ID: %s"), getThingId().c_str());
 }
 
 /******************************************************************************
@@ -106,16 +106,16 @@ ArduinoIoTCloudLPWAN::State ArduinoIoTCloudLPWAN::handle_ConnectPhy()
 ArduinoIoTCloudLPWAN::State ArduinoIoTCloudLPWAN::handle_SyncTime()
 {
   unsigned long const internal_posix_time = _time_service.getTime();
-  DBG_VERBOSE(F("ArduinoIoTCloudLPWAN::%s internal clock configured to posix timestamp %d"), __FUNCTION__, internal_posix_time);
-  DBG_INFO(F("Connected to Arduino IoT Cloud"));
+  DEBUG_VERBOSE(F("ArduinoIoTCloudLPWAN::%s internal clock configured to posix timestamp %d"), __FUNCTION__, internal_posix_time);
+  DEBUG_INFO(F("Connected to Arduino IoT Cloud"));
   return State::Connected;
 }
 
 ArduinoIoTCloudLPWAN::State ArduinoIoTCloudLPWAN::handle_Connected()
 {
   if (!connected())
   {
-    DBG_ERROR(F("ArduinoIoTCloudLPWAN::%s connection to gateway lost"), __FUNCTION__);
+    DEBUG_ERROR(F("ArduinoIoTCloudLPWAN::%s connection to gateway lost"), __FUNCTION__);
     return State::ConnectPhy;
   }
 

src/utility/ota/FlashSHA256.cpp

@@ -100,8 +100,8 @@ String FlashSHA256::calc(uint32_t const start_addr, uint32_t const max_flash_siz
                   sha256_str += buf;
                 });
   /* Do some debug printout. */
-  DBG_VERBOSE("SHA256: %d bytes read", flash_addr);
-  DBG_VERBOSE("SHA256: HASH(%d) = %s", strlen(sha256_str.c_str()), sha256_str.c_str());
+  DEBUG_VERBOSE("SHA256: %d bytes read", flash_addr);
+  DEBUG_VERBOSE("SHA256: HASH(%d) = %s", strlen(sha256_str.c_str()), sha256_str.c_str());
   return sha256_str;
 }