diff --git a/platformio.ini b/platformio.ini index 2cab677..3d78921 100644 --- a/platformio.ini +++ b/platformio.ini @@ -20,7 +20,7 @@ lib_deps = gyverlibs/GyverPID@^3.3 gyverlibs/GyverBlinker@^1.0 milesburton/DallasTemperature@^3.11.0 - laxilef/TinyLogger@^1.0.5 + laxilef/TinyLogger@^1.0.6 https://github.com/Laxilef/WiFiManager/archive/refs/heads/patch-1.zip ;https://github.com/tzapu/WiFiManager.git#v2.0.16-rc.2 build_flags = diff --git a/src/MainTask.h b/src/MainTask.h index 9ba6237..febee63 100644 --- a/src/MainTask.h +++ b/src/MainTask.h @@ -73,7 +73,7 @@ protected: firstFailConnect = 0; } - if ( Log.getLevel() == TinyLogger::Level::VERBOSE && !settings.debug ) { + if ( Log.getLevel() != TinyLogger::Level::INFO && !settings.debug ) { Log.setLevel(TinyLogger::Level::INFO); } else if ( Log.getLevel() != TinyLogger::Level::VERBOSE && settings.debug ) { @@ -108,11 +108,14 @@ protected: heap(); // anti memory leak - for (Stream* stream : Log.getStreams()) { - while (stream->available()) { - stream->read(); - yield(); + if (!Log.isLocked()) { + Log.lock(); + for (Stream* stream : Log.getStreams()) { + while (stream->available() > 0) { + stream->read(); + } } + Log.unlock(); } if (restartSignalTime > 0 && millis() - restartSignalTime > 10000) { diff --git a/src/main.cpp b/src/main.cpp index f990a2d..a34e1b7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -43,6 +43,10 @@ MainTask* tMain; void setup() { Log.setLevel(TinyLogger::Level::VERBOSE); + Log.setServiceTemplate("\033[1m[%s]\033[22m"); + Log.setLevelTemplate("\033[1m[%s]\033[22m"); + Log.setMsgPrefix("\033[m "); + #if USE_SERIAL Serial.begin(115200); Log.addStream(&Serial);