Replacing direct calls to Debug.print(... with the desired debug macro

aentinger · aentinger · commit 5a57fa0d11f1 · 2020-07-09T13:52:44.000+02:00
diff --git a/src/ArduinoIoTCloud.cpp b/src/ArduinoIoTCloud.cpp
@@ -199,11 +199,11 @@ void ArduinoIoTCloudClass::printConnectionStatus(ArduinoIoTConnectionStatus stat
 {
   switch (status)
   {
-    case ArduinoIoTConnectionStatus::IDLE:         Debug.print(DBG_INFO,  "Arduino IoT Cloud Connection status: IDLE");         break;
-    case ArduinoIoTConnectionStatus::ERROR:        Debug.print(DBG_ERROR, "Arduino IoT Cloud Connection status: ERROR");        break;
-    case ArduinoIoTConnectionStatus::CONNECTING:   Debug.print(DBG_INFO,  "Arduino IoT Cloud Connection status: CONNECTING");   break;
-    case ArduinoIoTConnectionStatus::RECONNECTING: Debug.print(DBG_INFO,  "Arduino IoT Cloud Connection status: RECONNECTING"); break;
-    case ArduinoIoTConnectionStatus::CONNECTED:    Debug.print(DBG_INFO,  "Arduino IoT Cloud Connection status: CONNECTED");    break;
-    case ArduinoIoTConnectionStatus::DISCONNECTED: Debug.print(DBG_ERROR, "Arduino IoT Cloud Connection status: DISCONNECTED"); break;
+    case ArduinoIoTConnectionStatus::IDLE:         DBG_INFO   ("Arduino IoT Cloud Connection status: IDLE");         break;
+    case ArduinoIoTConnectionStatus::ERROR:        DBG_ERROR("Arduino IoT Cloud Connection status: ERROR");        break;
+    case ArduinoIoTConnectionStatus::CONNECTING:   DBG_INFO   ("Arduino IoT Cloud Connection status: CONNECTING");   break;
+    case ArduinoIoTConnectionStatus::RECONNECTING: DBG_INFO   ("Arduino IoT Cloud Connection status: RECONNECTING"); break;
+    case ArduinoIoTConnectionStatus::CONNECTED:    DBG_INFO   ("Arduino IoT Cloud Connection status: CONNECTED");    break;
+    case ArduinoIoTConnectionStatus::DISCONNECTED: DBG_ERROR("Arduino IoT Cloud Connection status: DISCONNECTED"); break;
   }
 }
diff --git a/src/ArduinoIoTCloudLPWAN.cpp b/src/ArduinoIoTCloudLPWAN.cpp
@@ -101,8 +101,8 @@ void ArduinoIoTCloudLPWAN::update()
 
 void ArduinoIoTCloudLPWAN::printDebugInfo()
 {
-  Debug.print(DBG_INFO, "***** Arduino IoT Cloud LPWAN - configuration info *****");
-  Debug.print(DBG_INFO, "Thing ID: %s", getThingId().c_str());
+  DBG_INFO("***** Arduino IoT Cloud LPWAN - configuration info *****");
+  DBG_INFO("Thing ID: %s", getThingId().c_str());
 }
 
 /******************************************************************************
diff --git a/src/ArduinoIoTCloudTCP.cpp b/src/ArduinoIoTCloudTCP.cpp
@@ -119,9 +119,9 @@ int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort)
   _brokerPort = brokerPort;
 
   #ifdef BOARD_HAS_ECCX08
-  if (!ECCX08.begin())                                                                                                                                                         { Debug.print(DBG_ERROR, "Cryptography processor failure. Make sure you have a compatible board."); return 0; }
-  if (!CryptoUtil::readDeviceId(ECCX08, getDeviceId(), ECCX08Slot::DeviceId))                                                                                                  { Debug.print(DBG_ERROR, "Cryptography processor read failure."); return 0; }
-  if (!CryptoUtil::reconstructCertificate(_eccx08_cert, getDeviceId(), ECCX08Slot::Key, ECCX08Slot::CompressedCertificate, ECCX08Slot::SerialNumberAndAuthorityKeyIdentifier)) { Debug.print(DBG_ERROR, "Cryptography certificate reconstruction failure."); return 0; }
+  if (!ECCX08.begin())                                                                                                                                                         { DBG_ERROR("Cryptography processor failure. Make sure you have a compatible board."); return 0; }
+  if (!CryptoUtil::readDeviceId(ECCX08, getDeviceId(), ECCX08Slot::DeviceId))                                                                                                  { DBG_ERROR("Cryptography processor read failure."); return 0; }
+  if (!CryptoUtil::reconstructCertificate(_eccx08_cert, getDeviceId(), ECCX08Slot::Key, ECCX08Slot::CompressedCertificate, ECCX08Slot::SerialNumberAndAuthorityKeyIdentifier)) { DBG_ERROR("Cryptography certificate reconstruction failure."); return 0; }
   _sslClient.setClient(_connection->getClient());
   _sslClient.setEccSlot(static_cast<int>(ECCX08Slot::Key), _eccx08_cert.bytes(), _eccx08_cert.length());
   #elif defined(BOARD_ESP)
@@ -219,10 +219,10 @@ int ArduinoIoTCloudTCP::connected()
 
 void ArduinoIoTCloudTCP::printDebugInfo()
 {
-  Debug.print(DBG_INFO, "***** Arduino IoT Cloud - configuration info *****");
-  Debug.print(DBG_INFO, "Device ID: %s", getDeviceId().c_str());
-  Debug.print(DBG_INFO, "Thing ID: %s", getThingId().c_str());
-  Debug.print(DBG_INFO, "MQTT Broker: %s:%d", _brokerAddress.c_str(), _brokerPort);
+  DBG_INFO("***** Arduino IoT Cloud - configuration info *****");
+  DBG_INFO("Device ID: %s", getDeviceId().c_str());
+  DBG_INFO("Thing ID: %s", getThingId().c_str());
+  DBG_INFO("MQTT Broker: %s:%d", _brokerAddress.c_str(), _brokerPort);
 }
 
 #if OTA_ENABLED
@@ -342,7 +342,7 @@ ArduinoIoTConnectionStatus ArduinoIoTCloudTCP::checkCloudConnection()
     case ArduinoIoTConnectionStatus::DISCONNECTED: next_iot_status = ArduinoIoTConnectionStatus::RECONNECTING; break;
     case ArduinoIoTConnectionStatus::CONNECTING:
     {
-      Debug.print(DBG_INFO, "Arduino IoT Cloud connecting ...");
+      DBG_INFO("Arduino IoT Cloud connecting ...");
       int const ret = connect();
       if (ret == CONNECT_SUCCESS)
       {
@@ -352,14 +352,14 @@ ArduinoIoTConnectionStatus ArduinoIoTCloudTCP::checkCloudConnection()
       }
       else if (ret == CONNECT_FAILURE_SUBSCRIBE)
       {
-        Debug.print(DBG_ERROR, "ERROR - Please verify your THING ID");
+        DBG_ERROR("ERROR - Please verify your THING ID");
       }
     }
     break;
 
     case ArduinoIoTConnectionStatus::RECONNECTING:
     {
-      Debug.print(DBG_INFO, "Arduino IoT Cloud reconnecting ...");
+      DBG_INFO("Arduino IoT Cloud reconnecting ...");
       if (reconnect() == CONNECT_SUCCESS)
       {
         next_iot_status = ArduinoIoTConnectionStatus::CONNECTED;
diff --git a/src/utility/ota/OTAStorage_SFU.cpp b/src/utility/ota/OTAStorage_SFU.cpp
@@ -44,12 +44,12 @@ bool OTAStorage_SFU::init()
 {
   flash.begin();
   if(SPIFFS_OK != filesystem.mount()) {
-    Debug.print(DBG_ERROR, "OTAStorage_SFU::init - mount() failed with error code %d", filesystem.err());
+    DBG_ERROR("OTAStorage_SFU::init - mount() failed with error code %d", filesystem.err());
     return false;
   }
 
   if(SPIFFS_OK != filesystem.check()) {
-    Debug.print(DBG_ERROR, "OTAStorage_SFU::init - check() failed with error code %d", filesystem.err());
+    DBG_ERROR("OTAStorage_SFU::init - check() failed with error code %d", filesystem.err());
     return false;
   }
 
@@ -61,7 +61,7 @@ bool OTAStorage_SFU::open(char const * file_name)
   filesystem.clearerr();
   _file = new File(filesystem.open(file_name, CREATE | WRITE_ONLY| TRUNCATE));
   if(SPIFFS_OK != filesystem.err()) {
-    Debug.print(DBG_ERROR, "OTAStorage_SFU::open - open() failed with error code %d", filesystem.err());
+    DBG_ERROR("OTAStorage_SFU::open - open() failed with error code %d", filesystem.err());
     delete _file;
     return false;
   }

Original file line number	Diff line number	Diff line change
`@@ -199,11 +199,11 @@ void ArduinoIoTCloudClass::printConnectionStatus(ArduinoIoTConnectionStatus stat`
`199`	`199`	`{`
`200`	`200`	`switch (status)`
`201`	`201`	`{`
`202`		`- case ArduinoIoTConnectionStatus::IDLE: Debug.print(DBG_INFO, "Arduino IoT Cloud Connection status: IDLE"); break;`
`203`		`- case ArduinoIoTConnectionStatus::ERROR: Debug.print(DBG_ERROR, "Arduino IoT Cloud Connection status: ERROR"); break;`
`204`		`- case ArduinoIoTConnectionStatus::CONNECTING: Debug.print(DBG_INFO, "Arduino IoT Cloud Connection status: CONNECTING"); break;`
`205`		`- case ArduinoIoTConnectionStatus::RECONNECTING: Debug.print(DBG_INFO, "Arduino IoT Cloud Connection status: RECONNECTING"); break;`
`206`		`- case ArduinoIoTConnectionStatus::CONNECTED: Debug.print(DBG_INFO, "Arduino IoT Cloud Connection status: CONNECTED"); break;`
`207`		`- case ArduinoIoTConnectionStatus::DISCONNECTED: Debug.print(DBG_ERROR, "Arduino IoT Cloud Connection status: DISCONNECTED"); break;`
	`202`	`+ case ArduinoIoTConnectionStatus::IDLE: DBG_INFO ("Arduino IoT Cloud Connection status: IDLE"); break;`
	`203`	`+ case ArduinoIoTConnectionStatus::ERROR: DBG_ERROR("Arduino IoT Cloud Connection status: ERROR"); break;`
	`204`	`+ case ArduinoIoTConnectionStatus::CONNECTING: DBG_INFO ("Arduino IoT Cloud Connection status: CONNECTING"); break;`
	`205`	`+ case ArduinoIoTConnectionStatus::RECONNECTING: DBG_INFO ("Arduino IoT Cloud Connection status: RECONNECTING"); break;`
	`206`	`+ case ArduinoIoTConnectionStatus::CONNECTED: DBG_INFO ("Arduino IoT Cloud Connection status: CONNECTED"); break;`
	`207`	`+ case ArduinoIoTConnectionStatus::DISCONNECTED: DBG_ERROR("Arduino IoT Cloud Connection status: DISCONNECTED"); break;`
`208`	`208`	`}`
`209`	`209`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,8 +101,8 @@ void ArduinoIoTCloudLPWAN::update()`
`101`	`101`
`102`	`102`	`void ArduinoIoTCloudLPWAN::printDebugInfo()`
`103`	`103`	`{`
`104`		`- Debug.print(DBG_INFO, "*** Arduino IoT Cloud LPWAN - configuration info ***");`
`105`		`- Debug.print(DBG_INFO, "Thing ID: %s", getThingId().c_str());`
	`104`	`+ DBG_INFO("*** Arduino IoT Cloud LPWAN - configuration info ***");`
	`105`	`+ DBG_INFO("Thing ID: %s", getThingId().c_str());`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`/******************************************************************************`
Original file line number	Diff line number	Diff line change
`@@ -119,9 +119,9 @@ int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort)`
`119`	`119`	`_brokerPort = brokerPort;`
`120`	`120`
`121`	`121`	`#ifdef BOARD_HAS_ECCX08`
`122`		`- if (!ECCX08.begin()) { Debug.print(DBG_ERROR, "Cryptography processor failure. Make sure you have a compatible board."); return 0; }`
`123`		`- if (!CryptoUtil::readDeviceId(ECCX08, getDeviceId(), ECCX08Slot::DeviceId)) { Debug.print(DBG_ERROR, "Cryptography processor read failure."); return 0; }`
`124`		`- if (!CryptoUtil::reconstructCertificate(_eccx08_cert, getDeviceId(), ECCX08Slot::Key, ECCX08Slot::CompressedCertificate, ECCX08Slot::SerialNumberAndAuthorityKeyIdentifier)) { Debug.print(DBG_ERROR, "Cryptography certificate reconstruction failure."); return 0; }`
	`122`	`+ if (!ECCX08.begin()) { DBG_ERROR("Cryptography processor failure. Make sure you have a compatible board."); return 0; }`
	`123`	`+ if (!CryptoUtil::readDeviceId(ECCX08, getDeviceId(), ECCX08Slot::DeviceId)) { DBG_ERROR("Cryptography processor read failure."); return 0; }`
	`124`	`+ if (!CryptoUtil::reconstructCertificate(_eccx08_cert, getDeviceId(), ECCX08Slot::Key, ECCX08Slot::CompressedCertificate, ECCX08Slot::SerialNumberAndAuthorityKeyIdentifier)) { DBG_ERROR("Cryptography certificate reconstruction failure."); return 0; }`
`125`	`125`	`_sslClient.setClient(_connection->getClient());`
`126`	`126`	`_sslClient.setEccSlot(static_cast<int>(ECCX08Slot::Key), _eccx08_cert.bytes(), _eccx08_cert.length());`
`127`	`127`	`#elif defined(BOARD_ESP)`
`@@ -219,10 +219,10 @@ int ArduinoIoTCloudTCP::connected()`
`219`	`219`
`220`	`220`	`void ArduinoIoTCloudTCP::printDebugInfo()`
`221`	`221`	`{`
`222`		`- Debug.print(DBG_INFO, "*** Arduino IoT Cloud - configuration info ***");`
`223`		`- Debug.print(DBG_INFO, "Device ID: %s", getDeviceId().c_str());`
`224`		`- Debug.print(DBG_INFO, "Thing ID: %s", getThingId().c_str());`
`225`		`- Debug.print(DBG_INFO, "MQTT Broker: %s:%d", _brokerAddress.c_str(), _brokerPort);`
	`222`	`+ DBG_INFO("*** Arduino IoT Cloud - configuration info ***");`
	`223`	`+ DBG_INFO("Device ID: %s", getDeviceId().c_str());`
	`224`	`+ DBG_INFO("Thing ID: %s", getThingId().c_str());`
	`225`	`+ DBG_INFO("MQTT Broker: %s:%d", _brokerAddress.c_str(), _brokerPort);`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`#if OTA_ENABLED`
`@@ -342,7 +342,7 @@ ArduinoIoTConnectionStatus ArduinoIoTCloudTCP::checkCloudConnection()`
`342`	`342`	`case ArduinoIoTConnectionStatus::DISCONNECTED: next_iot_status = ArduinoIoTConnectionStatus::RECONNECTING; break;`
`343`	`343`	`case ArduinoIoTConnectionStatus::CONNECTING:`
`344`	`344`	`{`
`345`		`- Debug.print(DBG_INFO, "Arduino IoT Cloud connecting ...");`
	`345`	`+ DBG_INFO("Arduino IoT Cloud connecting ...");`
`346`	`346`	`int const ret = connect();`
`347`	`347`	`if (ret == CONNECT_SUCCESS)`
`348`	`348`	`{`
`@@ -352,14 +352,14 @@ ArduinoIoTConnectionStatus ArduinoIoTCloudTCP::checkCloudConnection()`
`352`	`352`	`}`
`353`	`353`	`else if (ret == CONNECT_FAILURE_SUBSCRIBE)`
`354`	`354`	`{`
`355`		`- Debug.print(DBG_ERROR, "ERROR - Please verify your THING ID");`
	`355`	`+ DBG_ERROR("ERROR - Please verify your THING ID");`
`356`	`356`	`}`
`357`	`357`	`}`
`358`	`358`	`break;`
`359`	`359`
`360`	`360`	`case ArduinoIoTConnectionStatus::RECONNECTING:`
`361`	`361`	`{`
`362`		`- Debug.print(DBG_INFO, "Arduino IoT Cloud reconnecting ...");`
	`362`	`+ DBG_INFO("Arduino IoT Cloud reconnecting ...");`
`363`	`363`	`if (reconnect() == CONNECT_SUCCESS)`
`364`	`364`	`{`
`365`	`365`	`next_iot_status = ArduinoIoTConnectionStatus::CONNECTED;`
Original file line number	Diff line number	Diff line change
`@@ -44,12 +44,12 @@ bool OTAStorage_SFU::init()`
`44`	`44`	`{`
`45`	`45`	`flash.begin();`
`46`	`46`	`if(SPIFFS_OK != filesystem.mount()) {`
`47`		`- Debug.print(DBG_ERROR, "OTAStorage_SFU::init - mount() failed with error code %d", filesystem.err());`
	`47`	`+ DBG_ERROR("OTAStorage_SFU::init - mount() failed with error code %d", filesystem.err());`
`48`	`48`	`return false;`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`if(SPIFFS_OK != filesystem.check()) {`
`52`		`- Debug.print(DBG_ERROR, "OTAStorage_SFU::init - check() failed with error code %d", filesystem.err());`
	`52`	`+ DBG_ERROR("OTAStorage_SFU::init - check() failed with error code %d", filesystem.err());`
`53`	`53`	`return false;`
`54`	`54`	`}`
`55`	`55`
`@@ -61,7 +61,7 @@ bool OTAStorage_SFU::open(char const * file_name)`
`61`	`61`	`filesystem.clearerr();`
`62`	`62`	`_file = new File(filesystem.open(file_name, CREATE \| WRITE_ONLY\| TRUNCATE));`
`63`	`63`	`if(SPIFFS_OK != filesystem.err()) {`
`64`		`- Debug.print(DBG_ERROR, "OTAStorage_SFU::open - open() failed with error code %d", filesystem.err());`
	`64`	`+ DBG_ERROR("OTAStorage_SFU::open - open() failed with error code %d", filesystem.err());`
`65`	`65`	`delete _file;`
`66`	`66`	`return false;`
`67`	`67`	`}`