chriz/OpenMQTT-Gateway
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

[SYS] Reduce Logs flash footprint (#2232)

Browse Source 
By building only the log level required into LOG_LEVEL

Co-authored-by: Florian <1technophile@users.noreply.github.com>
This commit is contained in:
FlorianandFlorian authored and GitHub committed 2025-08-19 09:15:41 -05:00
1 parent 6e6b54b05e
commit 32174e37a5
52 files changed
+1187 -1136
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

main/gateway2G.cpp
+25 -25
View File
@@ -45,28 +45,28 @@ int unreadSMSNum = 0;
SMSmessage sms;
void setup2G() {
Log.notice(F("_2G_TX_GPIO: %d " CR), _2G_TX_GPIO);
Log.notice(F("_2G_RX_GPIO: %d " CR), _2G_RX_GPIO);
THEENGS_LOG_NOTICE(F("_2G_TX_GPIO: %d " CR), _2G_TX_GPIO);
THEENGS_LOG_NOTICE(F("_2G_RX_GPIO: %d " CR), _2G_RX_GPIO);
setupGSM(false);
Log.trace(F("gateway2G setup done " CR));
THEENGS_LOG_TRACE(F("gateway2G setup done " CR));
}
void setupGSM(bool deleteSMS) {
Log.trace(F("Init 2G module: %d" CR), _2G_PWR_GPIO);
THEENGS_LOG_TRACE(F("Init 2G module: %d" CR), _2G_PWR_GPIO);
delay(1000);
// Power-cycle the module to reset it.
A6l.powerCycle(_2G_PWR_GPIO);
Log.notice(F("waiting for network connection at bd: %d" CR), _2G_MODULE_BAUDRATE);
THEENGS_LOG_NOTICE(F("waiting for network connection at bd: %d" CR), _2G_MODULE_BAUDRATE);
A6l.blockUntilReady(_2G_MODULE_BAUDRATE);
Log.notice(F("A6/A7 gsm ready" CR));
THEENGS_LOG_NOTICE(F("A6/A7 gsm ready" CR));
signalStrengthAnalysis();
delay(1000);
// deleting all sms
if (deleteSMS) {
if (A6l.deleteSMS(1, 4) == A6_OK) {
Log.notice(F("delete SMS OK" CR));
THEENGS_LOG_NOTICE(F("delete SMS OK" CR));
} else {
Log.error(F("delete SMS KO" CR));
THEENGS_LOG_ERROR(F("delete SMS KO" CR));
}
}
}
@@ -74,9 +74,9 @@ void setupGSM(bool deleteSMS) {
void signalStrengthAnalysis() {
int signalStrength = 0;
signalStrength = A6l.getSignalStrength();
Log.trace(F("Signal strength: %d" CR), signalStrength);
THEENGS_LOG_TRACE(F("Signal strength: %d" CR), signalStrength);
if (signalStrength < _2G_MIN_SIGNAL || signalStrength > _2G_MAX_SIGNAL) {
Log.trace(F("Signal too low restart the module" CR));
THEENGS_LOG_TRACE(F("Signal too low restart the module" CR));
setupGSM(false); // if we are below or above a threshold signal we relaunch the setup of GSM module
}
}
@@ -84,17 +84,17 @@ void signalStrengthAnalysis() {
bool _2GtoX() {
// Get the memory locations of unread SMS messages.
unreadSMSNum = A6l.getUnreadSMSLocs(unreadSMSLocs, 512);
Log.trace(F("Creating SMS buffer" CR));
THEENGS_LOG_TRACE(F("Creating SMS buffer" CR));
StaticJsonDocument<JSON_MSG_BUFFER> SMSdataBuffer;
JsonObject SMSdata = SMSdataBuffer.to<JsonObject>();
for (int i = 0; i < unreadSMSNum; i++) {
Log.notice(F("New message at index: %d" CR), unreadSMSNum);
THEENGS_LOG_NOTICE(F("New message at index: %d" CR), unreadSMSNum);
sms = A6l.readSMS(unreadSMSLocs[i]);
SMSdata["message"] = (const char*)sms.message.c_str();
SMSdata["date"] = (const char*)sms.date.c_str();
SMSdata["phone"] = (const char*)sms.number.c_str();
A6l.deleteSMS(unreadSMSLocs[i]); // we delete the SMS received
Log.trace(F("Adv data 2GtoMQTT" CR));
THEENGS_LOG_TRACE(F("Adv data 2GtoMQTT" CR));
SMSdata["origin"] = subject2GtoMQTT;
return enqueueJsonObject(SMSdata);
}
@@ -106,26 +106,26 @@ void Xto2G(const char* topicOri, const char* datacallback) {
String topic = topicOri;
if (cmpToMainTopic(topicOri, subjectMQTTto2G)) {
Log.trace(F("MQTTto2G data analysis" CR));
THEENGS_LOG_TRACE(F("MQTTto2G data analysis" CR));
// 2G DATA ANALYSIS
String phone_number = "";
int pos0 = topic.lastIndexOf(_2GPhoneKey);
if (pos0 != -1) {
pos0 = pos0 + strlen(_2GPhoneKey);
phone_number = topic.substring(pos0);
Log.notice(F("MQTTto2G phone: %s" CR), (char*)phone_number.c_str());
Log.notice(F("MQTTto2G sms: %s" CR), (char*)data.c_str());
THEENGS_LOG_NOTICE(F("MQTTto2G phone: %s" CR), (char*)phone_number.c_str());
THEENGS_LOG_NOTICE(F("MQTTto2G sms: %s" CR), (char*)data.c_str());
if (A6l.sendSMS(phone_number, data) == A6_OK) {
Log.notice(F("SMS OK" CR));
THEENGS_LOG_NOTICE(F("SMS OK" CR));
// Acknowledgement to the GTW2G topic
pub(subjectGTW2GtoMQTT, "SMS OK"); // we acknowledge the sending by publishing the value to an acknowledgement topic, for the moment even if it is a signal repetition we acknowledge also
} else {
Log.error(F("SMS KO" CR));
THEENGS_LOG_ERROR(F("SMS KO" CR));
// Acknowledgement to the GTW2G topic
pub(subjectGTW2GtoMQTT, "SMS KO"); // we acknowledge the sending by publishing the value to an acknowledgement topic, for the moment even if it is a signal repetition we acknowledge also
}
} else {
Log.error(F("MQTTto2G Fail reading phone number" CR));
THEENGS_LOG_ERROR(F("MQTTto2G Fail reading phone number" CR));
}
}
}
@@ -136,20 +136,20 @@ void Xto2G(const char* topicOri, JsonObject& SMSdata) {
if (cmpToMainTopic(topicOri, subjectMQTTto2G)) {
const char* sms = SMSdata["message"];
const char* phone = SMSdata["phone"];
Log.trace(F("MQTTto2G json data analysis" CR));
THEENGS_LOG_TRACE(F("MQTTto2G json data analysis" CR));
if (sms && phone) {
Log.notice(F("MQTTto2G phone: %s" CR), phone);
Log.notice(F("MQTTto2G sms: %s" CR), sms);
THEENGS_LOG_NOTICE(F("MQTTto2G phone: %s" CR), phone);
THEENGS_LOG_NOTICE(F("MQTTto2G sms: %s" CR), sms);
if (A6l.sendSMS(String(phone), String(sms)) == A6_OK) {
Log.notice(F("SMS OK" CR));
THEENGS_LOG_NOTICE(F("SMS OK" CR));
// Acknowledgement to the GTW2G topic
pub(subjectGTW2GtoMQTT, "SMS OK"); // we acknowledge the sending by publishing the value to an acknowledgement topic, for the moment even if it is a signal repetition we acknowledge also
} else {
Log.error(F("SMS KO" CR));
THEENGS_LOG_ERROR(F("SMS KO" CR));
pub(subjectGTW2GtoMQTT, "SMS KO"); // we acknowledge the sending by publishing the value to an acknowledgement topic, for the moment even if it is a signal repetition we acknowledge also
}
} else {
Log.error(F("MQTTto2G failed json read" CR));
THEENGS_LOG_ERROR(F("MQTTto2G failed json read" CR));
}
}
}