From 9a9566e17f6c4d440080253ce533640d15ca8067 Mon Sep 17 00:00:00 2001
From: strawmanbobi <strawmanbobi@163.com>
Date: Wed, 8 Jan 2025 13:06:29 +0800
Subject: [PATCH] unified debug text format

---
 esp8285/lib/AliyunIoTSDK/src/AliyunIoTSDK.cpp | 14 +++++++-------
 esp8285/lib/PubSubClient/src/PubSubClient.cpp |  2 +-
 esp8285/src/serials.h                         | 18 +++++++++---------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/esp8285/lib/AliyunIoTSDK/src/AliyunIoTSDK.cpp b/esp8285/lib/AliyunIoTSDK/src/AliyunIoTSDK.cpp
index 2664e82..c13742c 100644
--- a/esp8285/lib/AliyunIoTSDK/src/AliyunIoTSDK.cpp
+++ b/esp8285/lib/AliyunIoTSDK/src/AliyunIoTSDK.cpp
@@ -123,16 +123,16 @@ int AliyunIoTSDK::mqttCheckConnect() {
     int mqttStatus = 0;
     int connectRetry = 0;
 
-    Serial.println("INFO:\tAlink MQTT connection checking...");
+    Serial.println("INFO: Alink MQTT connection checking...");
 
     if (client != NULL && false == mqttConnecting) {
-        Serial.print("INFO:\tAlink MQTT client state = ");
+        Serial.print("INFO: Alink MQTT client state = ");
         Serial.println(client->state());
         if (MQTT_CONNECTED != client->state()) {
             connectRetry = 0;
             while (false == client->connected()) {
                 client->disconnect();
-                Serial.print("INFO:\tConnecting to MQTT Server, clientId = ");
+                Serial.print("INFO: Connecting to MQTT Server, clientId = ");
                 Serial.print(clientId);
                 Serial.print(", mqttUserName = ");
                 Serial.print(mqttUsername);
@@ -141,17 +141,17 @@ int AliyunIoTSDK::mqttCheckConnect() {
                 mqttConnecting = true;
 
                 if (client->connect(clientId, mqttUsername, mqttPwd)) {
-                    Serial.println("INFO:\tMQTT Connected!");
+                    Serial.println("INFO: MQTT Connected!");
                 } else {
-                    Serial.print("ERROR:\tMQTT Connect err: ");
+                    Serial.print("ERROR: MQTT Connect err: ");
                     Serial.println(client->state());
                     delay(MQTT_WAIT_GENERIC);
                     connectRetry++;
-                    Serial.print("INFO:\tAliot connection retry: ");
+                    Serial.print("INFO: Aliot connection retry: ");
                     Serial.println(connectRetry);
                     mqttStatus = -1;
                     if (connectRetry > MQTT_CONNECT_RETRY_MAX) {
-                        Serial.println("ERROR:\tMax connect retry times reached");
+                        Serial.println("ERROR: Max connect retry times reached");
                         break;
                     }
                 }
diff --git a/esp8285/lib/PubSubClient/src/PubSubClient.cpp b/esp8285/lib/PubSubClient/src/PubSubClient.cpp
index 88201b9..8356860 100644
--- a/esp8285/lib/PubSubClient/src/PubSubClient.cpp
+++ b/esp8285/lib/PubSubClient/src/PubSubClient.cpp
@@ -207,7 +207,7 @@ boolean PubSubClient::connect(const char *id, const char *user, const char *pass
                     return true;
                 } else {
                     _state = buffer[3];
-                    Serial.print("INFO:\tMQTT connection responded :");
+                    Serial.print("INFO: MQTT connection responded :");
                     Serial.println(_state);
                 }
             }
diff --git a/esp8285/src/serials.h b/esp8285/src/serials.h
index 3c72280..467fcfb 100644
--- a/esp8285/src/serials.h
+++ b/esp8285/src/serials.h
@@ -31,24 +31,24 @@
 // generic COM debug
 
 #define DEBUGLN(...) \
-    {if (LOG_DEBUG) { Serial.printf("DEBUG:\t"); Serial.println(__VA_ARGS__);}}
+    {if (LOG_DEBUG) { Serial.printf("DEBUG: "); Serial.println(__VA_ARGS__);}}
 #define DEBUGF(...) \
-    {if (LOG_DEBUG) { Serial.printf("DEBUG:\t"); Serial.printf(__VA_ARGS__);}}
+    {if (LOG_DEBUG) { Serial.printf("DEBUG: "); Serial.printf(__VA_ARGS__); Serial.println();}}
 #define DEBUG(...)  \
-    {if (LOG_DEBUG) { Serial.printf("DEBUG:\t"); Serial.print(__VA_ARGS__);}}
+    {if (LOG_DEBUG) { Serial.printf("DEBUG: "); Serial.print(__VA_ARGS__); Serial.println();}}
 
 #define INFOLN(...) \
-    {if (LOG_INFO) { Serial.printf("INFO:\t"); Serial.println(__VA_ARGS__);}}
+    {if (LOG_INFO) { Serial.printf("INFO: "); Serial.println(__VA_ARGS__);}}
 #define INFOF(...) \
-    {if (LOG_INFO) { Serial.printf("INFO:\t"); Serial.printf(__VA_ARGS__);}}
+    {if (LOG_INFO) { Serial.printf("INFO: "); Serial.printf(__VA_ARGS__); Serial.println();}}
 #define INFO(...)  \
-    {if (LOG_INFO) { Serial.printf("INFO:\t"); Serial.print(__VA_ARGS__);}}
+    {if (LOG_INFO) { Serial.printf("INFO: "); Serial.print(__VA_ARGS__); Serial.println();}}
 
 #define ERRORLN(...) \
-    {if (LOG_ERROR) { Serial.printf("ERROR:\t"); Serial.println(__VA_ARGS__);}}
+    {if (LOG_ERROR) { Serial.printf("ERROR: "); Serial.println(__VA_ARGS__);}}
 #define ERRORF(...) \
-    {if (LOG_ERROR) { Serial.printf("ERROR:\t"); Serial.printf(__VA_ARGS__);}}
+    {if (LOG_ERROR) { Serial.printf("ERROR: "); Serial.printf(__VA_ARGS__); Serial.println();}}
 #define ERROR(...)  \
-    {if (LOG_ERROR) { Serial.printf("ERROR:\t"); Serial.print(__VA_ARGS__);}}
+    {if (LOG_ERROR) { Serial.printf("ERROR: "); Serial.print(__VA_ARGS__); Serial.println();}}
 
 #endif // IRIS_KIT_SERIALS_H
\ No newline at end of file