irext/iris-kit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unified debug text format

Browse Source
This commit is contained in:
strawmanbobi
2025-01-08 13:06:29 +08:00
parent 92f1af2656
commit 9a9566e17f
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
esp8285/lib/AliyunIoTSDK/src/AliyunIoTSDK.cpp
View File

@@ -123,16 +123,16 @@ int AliyunIoTSDK::mqttCheckConnect() {
int mqttStatus = 0; int mqttStatus = 0;
int connectRetry = 0; int connectRetry = 0;
Serial.println("INFO:\tAlink MQTT connection checking..."); Serial.println("INFO: Alink MQTT connection checking...");
if (client != NULL && false == mqttConnecting) { if (client != NULL && false == mqttConnecting) {
Serial.print("INFO:\tAlink MQTT client state = "); Serial.print("INFO: Alink MQTT client state = ");
Serial.println(client->state()); Serial.println(client->state());
if (MQTT_CONNECTED != client->state()) { if (MQTT_CONNECTED != client->state()) {
connectRetry = 0; connectRetry = 0;
while (false == client->connected()) { while (false == client->connected()) {
client->disconnect(); client->disconnect();
Serial.print("INFO:\tConnecting to MQTT Server, clientId = "); Serial.print("INFO: Connecting to MQTT Server, clientId = ");
Serial.print(clientId); Serial.print(clientId);
Serial.print(", mqttUserName = "); Serial.print(", mqttUserName = ");
Serial.print(mqttUsername); Serial.print(mqttUsername);
@@ -141,17 +141,17 @@ int AliyunIoTSDK::mqttCheckConnect() {
mqttConnecting = true; mqttConnecting = true;
if (client->connect(clientId, mqttUsername, mqttPwd)) { if (client->connect(clientId, mqttUsername, mqttPwd)) {
Serial.println("INFO:\tMQTT Connected!"); Serial.println("INFO: MQTT Connected!");
} else { } else {
Serial.print("ERROR:\tMQTT Connect err: "); Serial.print("ERROR: MQTT Connect err: ");
Serial.println(client->state()); Serial.println(client->state());
delay(MQTT_WAIT_GENERIC); delay(MQTT_WAIT_GENERIC);
connectRetry++; connectRetry++;
Serial.print("INFO:\tAliot connection retry: "); Serial.print("INFO: Aliot connection retry: ");
Serial.println(connectRetry); Serial.println(connectRetry);
mqttStatus = -1; mqttStatus = -1;
if (connectRetry > MQTT_CONNECT_RETRY_MAX) { if (connectRetry > MQTT_CONNECT_RETRY_MAX) {
Serial.println("ERROR:\tMax connect retry times reached"); Serial.println("ERROR: Max connect retry times reached");
break; break;
} }
} }

2
esp8285/lib/PubSubClient/src/PubSubClient.cpp
View File

@@ -207,7 +207,7 @@ boolean PubSubClient::connect(const char *id, const char *user, const char *pass
return true; return true;
} else { } else {
_state = buffer[3]; _state = buffer[3];
Serial.print("INFO:\tMQTT connection responded :"); Serial.print("INFO: MQTT connection responded :");
Serial.println(_state); Serial.println(_state);
} }
} }

18
esp8285/src/serials.h
View File

@@ -31,24 +31,24 @@
// generic COM debug // generic COM debug
#define DEBUGLN(...) \ #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(...) \ #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(...) \ #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(...) \ #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(...) \ #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(...) \ #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(...) \ #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(...) \ #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(...) \ #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 #endif // IRIS_KIT_SERIALS_H