jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-25 20:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set ansi colors as flash strings

Browse Source
This commit is contained in:
fvanroie 2020-03-29 16:52:38 +02:00
parent d74f177d69
commit 0bef2ec42a
1 changed files with 39 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/hasp_debug.cpp
View File

@ -272,9 +272,9 @@ void debugSendOuput(const __FlashStringHelper * txt)
} }
*/ */
inline void debugSendAnsiCode(char * buffer, Print * _logOutput) inline void debugSendAnsiCode(const __FlashStringHelper * code, Print * _logOutput)
{ {
if(debugAnsiCodes) _logOutput->print(buffer); if(debugAnsiCodes) _logOutput->print(code);
} }
static void debugPrintTimestamp(int level, Print * _logOutput) static void debugPrintTimestamp(int level, Print * _logOutput)
@ -285,7 +285,7 @@ static void debugPrintTimestamp(int level, Print * _logOutput)
time(&rawtime); time(&rawtime);
timeinfo = localtime(&rawtime); timeinfo = localtime(&rawtime);
debugSendAnsiCode(TERM_COLOR_CYAN, _logOutput); debugSendAnsiCode(F(TERM_COLOR_CYAN), _logOutput);
// strftime(buffer, sizeof(buffer), ("[%b %d %H:%M:%S."), timeinfo); // strftime(buffer, sizeof(buffer), ("[%b %d %H:%M:%S."), timeinfo);
// strftime(buffer, sizeof(buffer), ("[%H:%M:%S."), timeinfo); // strftime(buffer, sizeof(buffer), ("[%H:%M:%S."), timeinfo);
if(timeinfo->tm_year >= 2020) { if(timeinfo->tm_year >= 2020) {
@ -307,11 +307,11 @@ static void debugPrintHaspMemory(int level, Print * _logOutput)
/* Print HASP Memory Info */ /* Print HASP Memory Info */
if(debugAnsiCodes) { if(debugAnsiCodes) {
if(maxfree > (1024u * 5) && (totalfree > 1024u * 6) && (frag <= 10)) if(maxfree > (1024u * 5) && (totalfree > 1024u * 6) && (frag <= 10))
debugSendAnsiCode(TERM_COLOR_GREEN, _logOutput); debugSendAnsiCode(F(TERM_COLOR_GREEN), _logOutput);
else if(maxfree > (1024u * 3) && (totalfree > 1024u * 5) && (frag <= 20)) else if(maxfree > (1024u * 3) && (totalfree > 1024u * 5) && (frag <= 20))
debugSendAnsiCode(TERM_COLOR_ORANGE, _logOutput); debugSendAnsiCode(F(TERM_COLOR_ORANGE), _logOutput);
else else
debugSendAnsiCode(TERM_COLOR_RED, _logOutput); debugSendAnsiCode(F(TERM_COLOR_RED), _logOutput);
} }
_logOutput->printf(PSTR("[%5u/%5u %2u] "), maxfree, totalfree, frag); _logOutput->printf(PSTR("[%5u/%5u %2u] "), maxfree, totalfree, frag);
} }
@ -325,12 +325,12 @@ static void debugPrintLvglMemory(int level, Print * _logOutput)
/* Print LVGL Memory Info */ /* Print LVGL Memory Info */
if(debugAnsiCodes) { if(debugAnsiCodes) {
if(mem_mon.free_biggest_size > (1024u * 2) && (mem_mon.free_size > 1024u * 2.5) && (mem_mon.frag_pct <= 10)) if(mem_mon.free_biggest_size > (1024u * 2) && (mem_mon.free_size > 1024u * 2.5) && (mem_mon.frag_pct <= 10))
debugSendAnsiCode(TERM_COLOR_GREEN, _logOutput); debugSendAnsiCode(F(TERM_COLOR_GREEN), _logOutput);
else if(mem_mon.free_biggest_size > (1024u * 1) && (mem_mon.free_size > 1024u * 1.5) && else if(mem_mon.free_biggest_size > (1024u * 1) && (mem_mon.free_size > 1024u * 1.5) &&
(mem_mon.frag_pct <= 25)) (mem_mon.frag_pct <= 25))
debugSendAnsiCode(TERM_COLOR_ORANGE, _logOutput); debugSendAnsiCode(F(TERM_COLOR_ORANGE), _logOutput);
else else
debugSendAnsiCode(TERM_COLOR_RED, _logOutput); debugSendAnsiCode(F(TERM_COLOR_RED), _logOutput);
} }
_logOutput->printf(PSTR("[%5u/%5u %2u] "), mem_mon.free_biggest_size, mem_mon.free_size, mem_mon.frag_pct); _logOutput->printf(PSTR("[%5u/%5u %2u] "), mem_mon.free_biggest_size, mem_mon.free_size, mem_mon.frag_pct);
} }
@ -341,22 +341,22 @@ static void debugPrintPriority(int level, Print * _logOutput)
switch(level) { switch(level) {
case LOG_LEVEL_FATAL: case LOG_LEVEL_FATAL:
case LOG_LEVEL_ERROR: case LOG_LEVEL_ERROR:
debugSendAnsiCode(TERM_COLOR_RED, _logOutput); debugSendAnsiCode(F(TERM_COLOR_RED), _logOutput);
break; break;
case LOG_LEVEL_WARNING: case LOG_LEVEL_WARNING:
debugSendAnsiCode(TERM_COLOR_YELLOW, _logOutput); debugSendAnsiCode(F(TERM_COLOR_YELLOW), _logOutput);
break; break;
case LOG_LEVEL_NOTICE: case LOG_LEVEL_NOTICE:
debugSendAnsiCode(TERM_COLOR_WHITE, _logOutput); debugSendAnsiCode(F(TERM_COLOR_WHITE), _logOutput);
break; break;
case LOG_LEVEL_VERBOSE: case LOG_LEVEL_VERBOSE:
debugSendAnsiCode(TERM_COLOR_CYAN, _logOutput); debugSendAnsiCode(F(TERM_COLOR_CYAN), _logOutput);
break; break;
case LOG_LEVEL_TRACE: case LOG_LEVEL_TRACE:
debugSendAnsiCode(TERM_COLOR_GRAY, _logOutput); debugSendAnsiCode(F(TERM_COLOR_GRAY), _logOutput);
break; break;
default: default:
debugSendAnsiCode(TERM_COLOR_RESET, _logOutput); debugSendAnsiCode(F(TERM_COLOR_RESET), _logOutput);
} }
} }
@ -372,25 +372,11 @@ void debugPrintPrefix(int level, Print * _logOutput)
void debugPrintSuffix(int level, Print * _logOutput) void debugPrintSuffix(int level, Print * _logOutput)
{ {
/*
if(debugSerialStarted) {
Serial.print(debugOutput);
if(debugAnsiCodes) Serial.print(TERM_COLOR_RESET);
Serial.print("\r\n");
if(debugAnsiCodes) Serial.print(TERM_COLOR_MAGENTA);
}
telnetPrint(debugOutput);
if(debugAnsiCodes) telnetPrint(TERM_COLOR_RESET);
telnetPrint("\r\n");
if(debugAnsiCodes) telnetPrint(TERM_COLOR_MAGENTA);
*/
if(debugAnsiCodes) if(debugAnsiCodes)
_logOutput->println(TERM_COLOR_RESET); _logOutput->println(F(TERM_COLOR_RESET));
else else
_logOutput->println(); _logOutput->println();
if(debugAnsiCodes) _logOutput->print(TERM_COLOR_MAGENTA); if(debugAnsiCodes) _logOutput->print(F(TERM_COLOR_MAGENTA));
// syslogSend(level, debugOutput); // syslogSend(level, debugOutput);
} }
@ -411,36 +397,34 @@ void debugPreSetup(JsonObject settings)
Log.registerOutput(0, &Serial, LOG_LEVEL_VERBOSE, true); Log.registerOutput(0, &Serial, LOG_LEVEL_VERBOSE, true);
Log.trace(F("Serial started at %u baud"), baudrate * 10); Log.trace(F("Serial started at %u baud"), baudrate * 10);
} }
// Serial.begin(74880); /* prepare for possible serial debug */
// Serial.begin(115200);
} }
#if LV_USE_LOG != 0 #if LV_USE_LOG != 0
static uint32_t lastDbgLine;
static uint16_t lastDbgFree;
void debugLvgl(lv_log_level_t level, const char * file, uint32_t line, const char * funcname, const char * descr) void debugLvgl(lv_log_level_t level, const char * file, uint32_t line, const char * funcname, const char * descr)
{ {
switch(level) { lv_mem_monitor_t mem_mon;
case LV_LOG_LEVEL_TRACE: lv_mem_monitor(&mem_mon);
Log.trace(descr);
// debugPrintPrefix(LOG_LEVEL_TRACE, NULL); /* Reduce the number of reepeated debug message */
break; if(line != lastDbgLine || mem_mon.free_biggest_size != lastDbgFree) {
case LV_LOG_LEVEL_WARN: switch(level) {
Log.warning(descr); case LV_LOG_LEVEL_TRACE:
// debugPrintPrefix(LOG_LEVEL_WARNING, NULL); Log.trace(descr);
break; break;
case LV_LOG_LEVEL_ERROR: case LV_LOG_LEVEL_WARN:
Log.error(descr); Log.warning(descr);
// debugPrintPrefix(LOG_LEVEL_ERROR, NULL); break;
break; case LV_LOG_LEVEL_ERROR:
default: Log.error(descr);
Log.notice(descr); break;
// debugPrintPrefix(LOG_LEVEL_WARNING, NULL); default:
Log.notice(descr);
}
lastDbgLine = line;
lastDbgFree = mem_mon.free_biggest_size;
} }
/*
debugSendOuput(F("LVGL: "));
debugSendOuput(descr);
debugSendOuput(F("\r\n"));
syslogSend(level, descr);*/
} }
#endif #endif