diff --git a/src/ArduinoIoTCloudDevice.cpp b/src/ArduinoIoTCloudDevice.cpp
index 574ad3a76..170dfe51a 100644
--- a/src/ArduinoIoTCloudDevice.cpp
+++ b/src/ArduinoIoTCloudDevice.cpp
@@ -65,7 +65,7 @@ void ArduinoCloudDevice::handleMessage(Message *m) {
case DeviceAttachedCmdId:
_attached = true;
_registered = true;
- DEBUG_VERBOSE("CloudDevice::%s Device is attached", __FUNCTION__);
+ DEBUG_VERBOSE("Device::%s Device is attached", __FUNCTION__);
nextState = State::Connected;
break;
@@ -115,7 +115,7 @@ ArduinoCloudDevice::State ArduinoCloudDevice::handleSendCapabilities() {
/* No device configuration received. Wait: 4s -> 8s -> 16s -> 32s -> 32s ...*/
_attachAttempt.retry();
- DEBUG_VERBOSE("CloudDevice::%s not attached. %d next configuration request in %d ms",
+ DEBUG_VERBOSE("Device::%s not attached. %d next configuration request in %d ms",
__FUNCTION__, _attachAttempt.getRetryCount(), _attachAttempt.getWaitTime());
return State::Connected;
}
diff --git a/src/ArduinoIoTCloudLPWAN.cpp b/src/ArduinoIoTCloudLPWAN.cpp
index 2e2693460..28efdee1a 100644
--- a/src/ArduinoIoTCloudLPWAN.cpp
+++ b/src/ArduinoIoTCloudLPWAN.cpp
@@ -107,7 +107,7 @@ ArduinoIoTCloudLPWAN::State ArduinoIoTCloudLPWAN::handle_ConnectPhy()
ArduinoIoTCloudLPWAN::State ArduinoIoTCloudLPWAN::handle_SyncTime()
{
- DEBUG_VERBOSE("ArduinoIoTCloudLPWAN::%s internal clock configured to posix timestamp %lu", __FUNCTION__, _time_service.getTime());
+ DEBUG_VERBOSE("LPWAN::%s internal clock configured to posix timestamp %lu", __FUNCTION__, _time_service.getTime());
DEBUG_INFO("Connected to Arduino IoT Cloud");
return State::Connected;
}
@@ -116,7 +116,7 @@ ArduinoIoTCloudLPWAN::State ArduinoIoTCloudLPWAN::handle_Connected()
{
if (!connected())
{
- DEBUG_ERROR("ArduinoIoTCloudLPWAN::%s connection to gateway lost", __FUNCTION__);
+ DEBUG_ERROR("LPWAN::%s connection to gateway lost", __FUNCTION__);
return State::ConnectPhy;
}
diff --git a/src/ArduinoIoTCloudNotecard.cpp b/src/ArduinoIoTCloudNotecard.cpp
index e9ec4a742..e02f38cdd 100644
--- a/src/ArduinoIoTCloudNotecard.cpp
+++ b/src/ArduinoIoTCloudNotecard.cpp
@@ -89,7 +89,7 @@ int ArduinoIoTCloudNotecard::begin(ConnectionHandler &connection_, int interrupt
// Initialize the connection to the Notecard
if (NetworkConnectionState::ERROR == _connection->check()) {
- DEBUG_ERROR("ArduinoIoTCloudNotecard::%s encountered fatal connection error!", __FUNCTION__);
+ DEBUG_ERROR("Notecard::%s encountered fatal connection error!", __FUNCTION__);
return 0; // (false -> failure)
}
@@ -163,11 +163,11 @@ ArduinoIoTCloudNotecard::State ArduinoIoTCloudNotecard::handle_SyncTime()
const uint32_t current_time = ArduinoCloud.getInternalTime();
if (TimeServiceClass::isTimeValid(current_time))
{
- DEBUG_VERBOSE("ArduinoIoTCloudNotecard::%s [%d] internal clock configured to posix timestamp %d", __FUNCTION__, millis(), current_time);
+ DEBUG_VERBOSE("Notecard::%s [%d] internal clock configured to posix timestamp %d", __FUNCTION__, millis(), current_time);
return State::Connected;
}
- DEBUG_ERROR("ArduinoIoTCloudNotecard::%s could not get valid time. Retrying now.", __FUNCTION__);
+ DEBUG_ERROR("Notecard::%s could not get valid time. Retrying now.", __FUNCTION__);
return State::ConnectPhy;
}
@@ -206,7 +206,7 @@ ArduinoIoTCloudNotecard::State ArduinoIoTCloudNotecard::handle_Connected()
ArduinoIoTCloudNotecard::State ArduinoIoTCloudNotecard::handle_Disconnect()
{
if (!connected()) {
- DEBUG_ERROR("ArduinoIoTCloudNotecard::%s connection to Notehub lost", __FUNCTION__);
+ DEBUG_ERROR("Notecard::%s connection to Notehub lost", __FUNCTION__);
}
// Reset the Thing and Device property containers
@@ -285,9 +285,9 @@ void ArduinoIoTCloudNotecard::fetchIncomingBytes(uint8_t *buf, size_t &len)
buf[bytes_received] = _connection->read();
}
if (bytes_received == len && _connection->available()) {
- DEBUG_ERROR("ArduinoIoTCloudNotecard::%s buffer overflow on inbound message", __FUNCTION__);
+ DEBUG_ERROR("Notecard::%s buffer overflow on inbound message", __FUNCTION__);
} else {
- DEBUG_DEBUG("ArduinoIoTCloudNotecard::%s received %d bytes from cloud", __FUNCTION__, bytes_received);
+ DEBUG_DEBUG("Notecard::%s received %d bytes from cloud", __FUNCTION__, bytes_received);
len = bytes_received;
}
}
@@ -306,20 +306,20 @@ void ArduinoIoTCloudNotecard::pollNotecard(void)
void ArduinoIoTCloudNotecard::processCommand(const uint8_t *buf, size_t len)
{
CommandDown command;
- DEBUG_VERBOSE("ArduinoIoTCloudNotecard::%s [%d] received %d bytes", __FUNCTION__, millis(), len);
+ DEBUG_VERBOSE("Notecard::%s [%d] received %d bytes", __FUNCTION__, millis(), len);
CBORMessageDecoder decoder;
if (decoder.decode((Message*)&command, buf, len) != Decoder::Status::Error) {
- DEBUG_VERBOSE("ArduinoIoTCloudNotecard::%s [%d] received command id %d", __FUNCTION__, millis(), command.c.id);
+ DEBUG_VERBOSE("Notecard::%s [%d] received command id %d", __FUNCTION__, millis(), command.c.id);
switch (command.c.id)
{
case CommandId::ThingUpdateCmdId:
{
- DEBUG_VERBOSE("ArduinoIoTCloudNotecard::%s [%d] device configuration received", __FUNCTION__, millis());
+ DEBUG_VERBOSE("Notecard::%s [%d] device configuration received", __FUNCTION__, millis());
String new_thing_id = String(command.thingUpdateCmd.params.thing_id);
if (!new_thing_id.length()) {
- DEBUG_DEBUG("ArduinoIoTCloudNotecard::%s received null Thing ID.", __FUNCTION__);
+ DEBUG_DEBUG("Notecard::%s received null Thing ID.", __FUNCTION__);
_thing_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx";
// Send message to device state machine to inform we have received a null thing-id
@@ -328,11 +328,11 @@ void ArduinoIoTCloudNotecard::processCommand(const uint8_t *buf, size_t len)
_device.handleMessage(&message);
} else {
if (_device.isAttached() && _thing_id != new_thing_id) {
- DEBUG_DEBUG("ArduinoIoTCloudNotecard::%s detaching Thing ID: %s", __FUNCTION__, _thing_id.c_str());
+ DEBUG_DEBUG("Notecard::%s detaching Thing ID: %s", __FUNCTION__, _thing_id.c_str());
detachThing();
}
if (!_device.isAttached()) {
- DEBUG_DEBUG("ArduinoIoTCloudNotecard::%s attaching Thing ID: %s", __FUNCTION__, new_thing_id.c_str());
+ DEBUG_DEBUG("Notecard::%s attaching Thing ID: %s", __FUNCTION__, new_thing_id.c_str());
attachThing(new_thing_id);
}
}
@@ -342,24 +342,24 @@ void ArduinoIoTCloudNotecard::processCommand(const uint8_t *buf, size_t len)
case CommandId::ThingDetachCmdId:
{
if (!_device.isAttached() || _thing_id != String(command.thingDetachCmd.params.thing_id)) {
- DEBUG_VERBOSE("ArduinoIoTCloudNotecard::%s [%d] thing detach rejected", __FUNCTION__, millis());
+ DEBUG_VERBOSE("Notecard::%s [%d] thing detach rejected", __FUNCTION__, millis());
}
- DEBUG_VERBOSE("ArduinoIoTCloudNotecard::%s [%d] thing detach received", __FUNCTION__, millis());
+ DEBUG_VERBOSE("Notecard::%s [%d] thing detach received", __FUNCTION__, millis());
detachThing();
}
break;
case CommandId::TimezoneCommandDownId:
{
- DEBUG_VERBOSE("ArduinoIoTCloudNotecard::%s [%d] timezone update received", __FUNCTION__, millis());
+ DEBUG_VERBOSE("Notecard::%s [%d] timezone update received", __FUNCTION__, millis());
_thing.handleMessage((Message*)&command);
}
break;
case CommandId::LastValuesUpdateCmdId:
{
- DEBUG_VERBOSE("ArduinoIoTCloudNotecard::%s [%d] last values received", __FUNCTION__, millis());
+ DEBUG_VERBOSE("Notecard::%s [%d] last values received", __FUNCTION__, millis());
CBORDecoder::decode(_thing.getPropertyContainer(),
(uint8_t*)command.lastValuesUpdateCmd.params.last_values,
command.lastValuesUpdateCmd.params.length, true);
@@ -379,7 +379,7 @@ void ArduinoIoTCloudNotecard::processCommand(const uint8_t *buf, size_t len)
#if OTA_ENABLED
case CommandId::OtaUpdateCmdDownId:
{
- DEBUG_VERBOSE("ArduinoIoTCloudNotecard::%s [%d] ota update received", __FUNCTION__, millis());
+ DEBUG_VERBOSE("Notecard::%s [%d] ota update received", __FUNCTION__, millis());
_ota.handleMessage((Message*)&command);
}
#endif
@@ -392,7 +392,7 @@ void ArduinoIoTCloudNotecard::processCommand(const uint8_t *buf, size_t len)
void ArduinoIoTCloudNotecard::processMessage(const uint8_t *buf, size_t len)
{
- DEBUG_VERBOSE("ArduinoIoTCloudNotecard::%s [%d] decoding %d bytes from cloud...", __FUNCTION__, millis(), len);
+ DEBUG_VERBOSE("Notecard::%s [%d] decoding %d bytes from cloud...", __FUNCTION__, millis(), len);
NotecardConnectionHandler *notecard_connection = reinterpret_cast<NotecardConnectionHandler *>(_connection);
switch (notecard_connection->getTopicType()) {
// Commands
@@ -433,7 +433,7 @@ void ArduinoIoTCloudNotecard::sendCommandMsgToCloud(Message * msg_)
if (CBOR_LORA_PAYLOAD_MAX_SIZE < bytes_encoded) {
DEBUG_WARNING("Encoded %d bytes for Command Message. Exceeds maximum payload size of %d bytes, and cannot be sent to cloud.", bytes_encoded, CBOR_LORA_PAYLOAD_MAX_SIZE);
} else if (bytes_encoded > 0) {
- DEBUG_DEBUG("ArduinoIoTCloudNotecard::%s encoded %d bytes for Command Message", __FUNCTION__, bytes_encoded);
+ DEBUG_DEBUG("Notecard::%s encoded %d bytes for Command Message", __FUNCTION__, bytes_encoded);
notecard_connection->setTopicType(NotecardConnectionHandler::TopicType::Command);
if (notecard_connection->write(data, bytes_encoded)) {
DEBUG_ERROR("Failed to send Command Message to cloud");
@@ -441,7 +441,7 @@ void ArduinoIoTCloudNotecard::sendCommandMsgToCloud(Message * msg_)
notecard_connection->initiateNotehubSync(NotecardConnectionHandler::SyncType::Inbound);
}
} else {
- DEBUG_DEBUG("ArduinoIoTCloudNotecard::%s encoded zero (0) bytes for Command Message", __FUNCTION__);
+ DEBUG_DEBUG("Notecard::%s encoded zero (0) bytes for Command Message", __FUNCTION__);
}
} else {
DEBUG_ERROR("Failed to encode Command Message");
@@ -461,7 +461,7 @@ void ArduinoIoTCloudNotecard::sendThingPropertyContainerToCloud()
} else if (bytes_encoded < 0) {
DEBUG_ERROR("Encoding Thing properties resulted in error: %d.", bytes_encoded);
} else if (bytes_encoded > 0) {
- DEBUG_DEBUG("ArduinoIoTCloudNotecard::%s encoded %d bytes of Thing properties", __FUNCTION__, bytes_encoded);
+ DEBUG_DEBUG("Notecard::%s encoded %d bytes of Thing properties", __FUNCTION__, bytes_encoded);
notecard_connection->setTopicType(NotecardConnectionHandler::TopicType::Thing);
if (notecard_connection->write(data, bytes_encoded)) {
DEBUG_ERROR("Failed to sync Thing properties with cloud");
diff --git a/src/ArduinoIoTCloudTCP.cpp b/src/ArduinoIoTCloudTCP.cpp
index f3ca4c402..9dab3928d 100644
--- a/src/ArduinoIoTCloudTCP.cpp
+++ b/src/ArduinoIoTCloudTCP.cpp
@@ -106,24 +106,24 @@ int ArduinoIoTCloudTCP::begin(ConnectionHandler & connection, bool const enable_
#if defined(BOARD_HAS_SECURE_ELEMENT)
if (!_selement.begin())
{
- DEBUG_ERROR("ArduinoIoTCloudTCP::%s could not initialize secure element.", __FUNCTION__);
+ DEBUG_ERROR("TCP::%s could not initialize secure element.", __FUNCTION__);
#if defined(ARDUINO_UNOWIFIR4)
if (String(WiFi.firmwareVersion()) < String("0.4.1")) {
- DEBUG_ERROR("ArduinoIoTCloudTCP::%s In order to read device certificate, WiFi firmware needs to be >= 0.4.1, current %s", __FUNCTION__, WiFi.firmwareVersion());
+ DEBUG_ERROR("TCP::%s In order to read device certificate, WiFi firmware needs to be >= 0.4.1, current %s", __FUNCTION__, WiFi.firmwareVersion());
}
#endif
return 0;
}
if (!SElementArduinoCloudDeviceId::read(_selement, getDeviceId(), SElementArduinoCloudSlot::DeviceId))
{
- DEBUG_ERROR("ArduinoIoTCloudTCP::%s could not read device id.", __FUNCTION__);
+ DEBUG_ERROR("TCP::%s could not read device id.", __FUNCTION__);
return 0;
}
if (!_writeCertOnConnect) {
/* No update pending read certificate stored in secure element */
if (!SElementArduinoCloudCertificate::read(_selement, _cert, SElementArduinoCloudSlot::CompressedCertificate))
{
- DEBUG_ERROR("ArduinoIoTCloudTCP::%s could not read device certificate.", __FUNCTION__);
+ DEBUG_ERROR("TCP::%s could not read device certificate.", __FUNCTION__);
return 0;
}
}
@@ -184,14 +184,14 @@ int ArduinoIoTCloudTCP::begin(bool const enable_watchdog, String brokerAddress,
#ifdef BOARD_HAS_OFFLOADED_ECCX08
if (String(WiFi.firmwareVersion()) < String("1.4.4")) {
- DEBUG_ERROR("ArduinoIoTCloudTCP::%s In order to connect to Arduino IoT Cloud, NINA firmware needs to be >= 1.4.4, current %s", __FUNCTION__, WiFi.firmwareVersion());
+ DEBUG_ERROR("TCP::%s In order to connect to Arduino IoT Cloud, NINA firmware needs to be >= 1.4.4, current %s", __FUNCTION__, WiFi.firmwareVersion());
return 0;
}
#endif /* BOARD_HAS_OFFLOADED_ECCX08 */
#if defined(ARDUINO_UNOWIFIR4)
if (String(WiFi.firmwareVersion()) < String("0.2.0")) {
- DEBUG_ERROR("ArduinoIoTCloudTCP::%s In order to connect to Arduino IoT Cloud, WiFi firmware needs to be >= 0.2.0, current %s", __FUNCTION__, WiFi.firmwareVersion());
+ DEBUG_ERROR("TCP::%s In order to connect to Arduino IoT Cloud, WiFi firmware needs to be >= 0.2.0, current %s", __FUNCTION__, WiFi.firmwareVersion());
}
#endif
@@ -274,11 +274,11 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_SyncTime()
/* If available force network time sync when connecting or reconnecting */
if (_time_service.sync())
{
- DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s internal clock configured to posix timestamp %d", __FUNCTION__, getTime());
+ DEBUG_VERBOSE("TCP::%s internal clock configured to posix timestamp %d", __FUNCTION__, getTime());
return State::ConnectMqttBroker;
}
- DEBUG_ERROR("ArduinoIoTCloudTCP::%s could not get valid time. Retrying now.", __FUNCTION__);
+ DEBUG_ERROR("TCP::%s could not get valid time. Retrying now.", __FUNCTION__);
return State::ConnectPhy;
}
@@ -295,12 +295,12 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_ConnectMqttBroker()
{
if (SElementArduinoCloudCertificate::write(_selement, _cert, SElementArduinoCloudSlot::CompressedCertificate))
{
- DEBUG_INFO("ArduinoIoTCloudTCP::%s device certificate update done.", __FUNCTION__);
+ DEBUG_INFO("TCP::%s device certificate update done.", __FUNCTION__);
_writeCertOnConnect = false;
}
}
#endif
- DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s connected to %s:%d", __FUNCTION__, _brokerAddress.c_str(), _brokerPort);
+ DEBUG_VERBOSE("TCP::%s connected to %s:%d", __FUNCTION__, _brokerAddress.c_str(), _brokerPort);
return State::Connected;
}
@@ -308,11 +308,11 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_ConnectMqttBroker()
_connection_attempt.retry();
#if defined (BOARD_STM32H7) && defined(BOARD_HAS_ECCX08)
- DEBUG_ERROR("ArduinoIoTCloudTCP::%s could not connect to %s:%d Mqtt error: %d TLS error: %d", __FUNCTION__, _brokerAddress.c_str(), _brokerPort, _mqttClient.connectError(), _brokerClient.errorCode());
+ DEBUG_ERROR("TCP::%s could not connect to %s:%d Mqtt error: %d TLS error: %d", __FUNCTION__, _brokerAddress.c_str(), _brokerPort, _mqttClient.connectError(), _brokerClient.errorCode());
#else
- DEBUG_ERROR("ArduinoIoTCloudTCP::%s could not connect to %s:%d Error: %d", __FUNCTION__, _brokerAddress.c_str(), _brokerPort, _mqttClient.connectError());
+ DEBUG_ERROR("TCP::%s could not connect to %s:%d Error: %d", __FUNCTION__, _brokerAddress.c_str(), _brokerPort, _mqttClient.connectError());
#endif
- DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s %d next connection attempt in %d ms", __FUNCTION__, _connection_attempt.getRetryCount(), _connection_attempt.getWaitTime());
+ DEBUG_VERBOSE("TCP::%s %d next connection attempt in %d ms", __FUNCTION__, _connection_attempt.getRetryCount(), _connection_attempt.getWaitTime());
/* Go back to ConnectPhy and retry to get time from network (invalid time for SSL handshake?)*/
return State::ConnectPhy;
}
@@ -360,7 +360,7 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_Connected()
ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_Disconnect()
{
if (!_mqttClient.connected()) {
- DEBUG_ERROR("ArduinoIoTCloudTCP::%s MQTT client connection lost", __FUNCTION__);
+ DEBUG_ERROR("TCP::%s MQTT client connection lost", __FUNCTION__);
} else {
/* No need to manually unsubscribe because we are using clean sessions */
_mqttClient.stop();
@@ -401,17 +401,17 @@ void ArduinoIoTCloudTCP::handleMessage(int length)
/* Topic for device commands */
if (_messageTopicIn == topic) {
CommandDown command;
- DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s [%d] received %d bytes", __FUNCTION__, millis(), length);
+ DEBUG_VERBOSE("TCP::%s [%d] received %d bytes", __FUNCTION__, millis(), length);
CBORMessageDecoder decoder;
size_t buffer_length = length;
if (decoder.decode((Message*)&command, bytes, buffer_length) != Decoder::Status::Error) {
- DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s [%d] received command id %d", __FUNCTION__, millis(), command.c.id);
+ DEBUG_VERBOSE("TCP::%s [%d] received command id %d", __FUNCTION__, millis(), command.c.id);
switch (command.c.id)
{
case CommandId::ThingUpdateCmdId:
{
- DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s [%d] device configuration received", __FUNCTION__, millis());
+ DEBUG_VERBOSE("TCP::%s [%d] device configuration received", __FUNCTION__, millis());
String new_thing_id = String(command.thingUpdateCmd.params.thing_id);
if (!new_thing_id.length()) {
@@ -434,24 +434,24 @@ void ArduinoIoTCloudTCP::handleMessage(int length)
case CommandId::ThingDetachCmdId:
{
if (!_device.isAttached() || _thing_id != String(command.thingDetachCmd.params.thing_id)) {
- DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s [%d] thing detach rejected", __FUNCTION__, millis());
+ DEBUG_VERBOSE("TCP::%s [%d] thing detach rejected", __FUNCTION__, millis());
}
- DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s [%d] thing detach received", __FUNCTION__, millis());
+ DEBUG_VERBOSE("TCP::%s [%d] thing detach received", __FUNCTION__, millis());
detachThing();
}
break;
case CommandId::TimezoneCommandDownId:
{
- DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s [%d] timezone update received", __FUNCTION__, millis());
+ DEBUG_VERBOSE("TCP::%s [%d] timezone update received", __FUNCTION__, millis());
_thing.handleMessage((Message*)&command);
}
break;
case CommandId::LastValuesUpdateCmdId:
{
- DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s [%d] last values received", __FUNCTION__, millis());
+ DEBUG_VERBOSE("TCP::%s [%d] last values received", __FUNCTION__, millis());
CBORDecoder::decode(_thing.getPropertyContainer(),
(uint8_t*)command.lastValuesUpdateCmd.params.last_values,
command.lastValuesUpdateCmd.params.length, true);
@@ -470,7 +470,7 @@ void ArduinoIoTCloudTCP::handleMessage(int length)
#if OTA_ENABLED
case CommandId::OtaUpdateCmdDownId:
{
- DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s [%d] ota update received", __FUNCTION__, millis());
+ DEBUG_VERBOSE("TCP::%s [%d] ota update received", __FUNCTION__, millis());
_ota.handleMessage((Message*)&command);
}
#endif
@@ -534,7 +534,7 @@ void ArduinoIoTCloudTCP::attachThing(String thingId)
_dataTopicIn = getTopic_datain();
_dataTopicOut = getTopic_dataout();
if (!_mqttClient.subscribe(_dataTopicIn)) {
- DEBUG_ERROR("ArduinoIoTCloudTCP::%s could not subscribe to %s", __FUNCTION__, _dataTopicIn.c_str());
+ DEBUG_ERROR("TCP::%s could not subscribe to %s", __FUNCTION__, _dataTopicIn.c_str());
DEBUG_ERROR("Check your thing configuration, and press the reset button on your board.");
_thing_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx";
return;
@@ -552,7 +552,7 @@ void ArduinoIoTCloudTCP::attachThing(String thingId)
void ArduinoIoTCloudTCP::detachThing()
{
if (!_mqttClient.unsubscribe(_dataTopicIn)) {
- DEBUG_ERROR("ArduinoIoTCloudTCP::%s could not unsubscribe from %s", __FUNCTION__, _dataTopicIn.c_str());
+ DEBUG_ERROR("TCP::%s could not unsubscribe from %s", __FUNCTION__, _dataTopicIn.c_str());
return;
}
@@ -591,38 +591,38 @@ int ArduinoIoTCloudTCP::updateCertificate(String authorityKeyIdentifier, String
{
if (!_selement.begin())
{
- DEBUG_ERROR("ArduinoIoTCloudTCP::%s could not initialize secure element.", __FUNCTION__);
+ DEBUG_ERROR("TCP::%s could not initialize secure element.", __FUNCTION__);
#if defined(ARDUINO_UNOWIFIR4)
if (String(WiFi.firmwareVersion()) < String("0.4.1")) {
- DEBUG_ERROR("ArduinoIoTCloudTCP::%s In order to read device certificate, WiFi firmware needs to be >= 0.4.1, current %s", __FUNCTION__, WiFi.firmwareVersion());
+ DEBUG_ERROR("TCP::%s In order to read device certificate, WiFi firmware needs to be >= 0.4.1, current %s", __FUNCTION__, WiFi.firmwareVersion());
}
#endif
return 0;
}
if (!SElementArduinoCloudDeviceId::read(_selement, getDeviceId(), SElementArduinoCloudSlot::DeviceId))
{
- DEBUG_ERROR("ArduinoIoTCloudTCP::%s could not read device id.", __FUNCTION__);
+ DEBUG_ERROR("TCP::%s could not read device id.", __FUNCTION__);
return 0;
}
/* read certificate stored in secure element to compare AUTHORITY_KEY_ID */
if (!SElementArduinoCloudCertificate::read(_selement, _cert, SElementArduinoCloudSlot::CompressedCertificate))
{
- DEBUG_ERROR("ArduinoIoTCloudTCP::%s could not read device certificate.", __FUNCTION__);
+ DEBUG_ERROR("TCP::%s could not read device certificate.", __FUNCTION__);
return 0;
}
/* check if we need to update 0 = equal <0 = error skip rebuild */
if(SElementArduinoCloudCertificate::signatureCompare(_cert.signatureBytes(), signature) <= 0) {
- DEBUG_INFO("ArduinoIoTCloudTCP::%s request skipped.", __FUNCTION__);
+ DEBUG_INFO("TCP::%s request skipped.", __FUNCTION__);
return 0;
}
/* rebuild device certificate */
if (SElementArduinoCloudCertificate::rebuild(_selement, _cert, getDeviceId(), notBefore, notAfter, serialNumber, authorityKeyIdentifier, signature))
{
- DEBUG_INFO("ArduinoIoTCloudTCP::%s request started.", __FUNCTION__);
+ DEBUG_INFO("TCP::%s request started.", __FUNCTION__);
#if defined(BOARD_HAS_OFFLOADED_ECCX08)
if (SElementArduinoCloudCertificate::write(_selement, _cert, SElementArduinoCloudSlot::CompressedCertificate))
{
- DEBUG_INFO("ArduinoIoTCloudTCP::%s update done.", __FUNCTION__);
+ DEBUG_INFO("TCP::%s update done.", __FUNCTION__);
}
#else
_writeCertOnConnect = true;
diff --git a/src/ArduinoIoTCloudThing.cpp b/src/ArduinoIoTCloudThing.cpp
index 5b07d0a5f..02b1e3fd6 100644
--- a/src/ArduinoIoTCloudThing.cpp
+++ b/src/ArduinoIoTCloudThing.cpp
@@ -89,7 +89,7 @@ void ArduinoCloudThing::handleMessage(Message* m) {
switch (_command) {
case LastValuesUpdateCmdId:
if (_state == State::RequestLastValues) {
- DEBUG_VERBOSE("CloudThing::%s Thing is synced", __FUNCTION__);
+ DEBUG_VERBOSE("Thing::%s Thing is synced", __FUNCTION__);
nextState = State::Connected;
}
break;
@@ -136,7 +136,7 @@ ArduinoCloudThing::State ArduinoCloudThing::handleRequestLastValues() {
/* Send message upstream to inform infrastructure we need to request thing
* last values
*/
- DEBUG_VERBOSE("CloudThing::%s not int sync. %d next sync request in %d ms",
+ DEBUG_VERBOSE("Thing::%s not int sync. %d next sync request in %d ms",
__FUNCTION__, _syncAttempt.getRetryCount(), _syncAttempt.getWaitTime());
Message message = { LastValuesBeginCmdId };
deliver(&message);