Enhanced logging: Show Loglevel

changelog.md

@@ -1,5 +1,6 @@
 ## DEV-branch
 
+* 21.10.2023: Enhanced logging: Show Loglevel
 * 14.10.2023: New define NO_SDCARD, enable to start without any SD card, e.g. for a webplayer only.
 * 05.10.2023: Enable "Arduino as component" by default
 * 02.10.2023: Optimize Arduino as component (Disable BLE, BT-HFP & SPI ethernet)

html/management.html

@@ -2050,11 +2050,13 @@ <h5 class="modal-title" data-i18n="tools.nvserase.title"></h5>
 				hslastwaitforstate: info.hallsensor.lastWaitState, hswaited: info.hallsensor.lastWaitMS}) + "\n";
 		}
 		$('#modalInfoContent').text(content);
+		$("#modalInfoContent").css("font-family","inherit");
 	}
 
 	async function fetchLog() {
 		let logtext = await (await fetch("/log")).text();
 		$('#modalInfoContent').text(logtext);
+		$("#modalInfoContent").css("font-family","monospace");
 	}
 
 	$(document).ready(function () {

src/Log.cpp

@@ -11,6 +11,21 @@ void Log_Init(void){
 	Log_RingBuffer = new LogRingBuffer();
 }
 
+String getLoglevel(const uint8_t logLevel) {
+	switch (logLevel) {
+		case LOGLEVEL_ERROR:
+			return "E"; 
+		case LOGLEVEL_NOTICE:
+			return "N"; 
+		case LOGLEVEL_INFO:
+			return "I"; 
+		case LOGLEVEL_DEBUG:
+			return "D"; 
+		default:
+			return " "; 
+	}
+}
+
 /* Wrapper-function for serial-logging (with newline)
    _logBuffer: char* to log
    _minLogLevel: loglevel configured for this message.
@@ -19,11 +34,10 @@ void Log_Init(void){
 void Log_Println(const char *_logBuffer, const uint8_t _minLogLevel) {
 	if (SERIAL_LOGLEVEL >= _minLogLevel) {
 		uint32_t ctime = millis();
-		Serial.printf("[ %u ]  ", ctime);
+		static String sLogLevel = getLoglevel(_minLogLevel);
+		Serial.printf("%s [%u] ", sLogLevel.c_str(), ctime);
 		Serial.println(_logBuffer);
-		Log_RingBuffer->print("[ ");
-		Log_RingBuffer->print(ctime);
-		Log_RingBuffer->print(" ]  ");
+		Log_RingBuffer->printf("%s [%u] ", sLogLevel.c_str(), ctime);
 		Log_RingBuffer->println(_logBuffer);
 	}
 }
@@ -33,14 +47,12 @@ void Log_Print(const char *_logBuffer, const uint8_t _minLogLevel, bool printTim
 	if (SERIAL_LOGLEVEL >= _minLogLevel) {
 		if (printTimestamp) {
 			uint32_t ctime = millis();
-			Serial.printf("[ %u ]  ", ctime);
+			static String sLogLevel = getLoglevel(_minLogLevel);
+			Serial.printf("%s [%u] ", sLogLevel.c_str(), ctime);
 			Serial.print(_logBuffer);
-			Log_RingBuffer->print("[ ");
-			Log_RingBuffer->print(ctime);
-			Log_RingBuffer->print(" ]  ");
+			Log_RingBuffer->printf("%s [%u] ", sLogLevel.c_str(), ctime);
 		} else {
 			Serial.print(_logBuffer);
-
 		}
 		Log_RingBuffer->print(_logBuffer);
 	}

src/revision.h

@@ -1,4 +1,4 @@
 #pragma once
 
 #include "gitrevision.h"
-constexpr const char softwareRevision[] = "Software-revision: 20231021-1";
+constexpr const char softwareRevision[] = "Software-revision: 20231021-2";