Fix for #210

lbussy · Feb 20, 2024 · f9932ef · f9932ef
1 parent cc742ea
commit f9932ef
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 10 deletions.
diff --git a/data_source/settings.htm b/data_source/settings.htm
@@ -2401,7 +2401,7 @@ <h4>Calibrate Flowmeters</h4>
 
                                     <div class="col-3">
                                         <div class="row form-group">
-                                            <select class="form-control" name="flowmeter" id="flowmeter">
+                                            <select class="form-control form-select" name="flowmeter" id="flowmeter">
                                                 <option value="0">1</option>
                                                 <option value="1">2</option>
                                                 <option value="2">3</option>
@@ -2697,7 +2697,7 @@ <h4>Debug Configuration</h4>
                                             </label>
                                         </div>
                                         <div class="col-sm-4">
-                                            <select class="form-select" id="loglevel" name="loglevel" data-form-type="other">
+                                            <select class="form-select form-control" id="loglevel" name="loglevel" data-form-type="other">
                                                 <option>0 - Silent, no output</option>
                                                 <option>1 - Fatal errors </option>
                                                 <option>2 - All errors </option>

diff --git a/data_source/version.json b/data_source/version.json
@@ -1,4 +1,4 @@
 {
-    "fw_version": "1.3.0",
-    "fs_version": "1.3.0"
+    "fw_version": "1.3.1-Beta.1",
+    "fs_version": "1.3.1-Beta.1"
 }
diff --git a/platformio.ini b/platformio.ini
@@ -44,7 +44,7 @@ lib_deps =
     lbussy/LCBUrl @ ~1.1.9
     bblanchon/ArduinoJson @ ~6.21.2
     https://github.com/lbussy/DS18B20_RT @ ~0.1.4
-    https://github.com/lbussy/Arduino-Log @ ~1.0.3
+    https://github.com/lbussy/Arduino-Log @ 1.1.1+sha.31d7620
     https://github.com/lbussy/AsyncWiFiManager.git
     https://github.com/lbussy/AsyncTCP#smarthomerocks
     https://github.com/lbussy/ESPAsyncWebServer @ ~1.2.3

diff --git a/src/serialhandler.cpp b/src/serialhandler.cpp
@@ -62,13 +62,13 @@ void serialBegin()
     {
         SERIAL.setDebugOutput(false);
         Log.begin(LOG_LEVEL_SILENT, &SERIAL, true);
-        Log.setPrefix(printTimestamp);
+        Log.setPrefix(printPrefix);
     }
     else if (!app.copconfig.serial)
     {
         SERIAL.setDebugOutput(true);
         Log.begin(app.copconfig.loglevel, &SERIAL, true);
-        Log.setPrefix(printTimestamp);
+        Log.setPrefix(printPrefix);
         Log.notice(F("Serial logging started at %l." CR), BAUD);
     }
 #endif
@@ -88,13 +88,13 @@ void serialStop()
     {
         Serial.setDebugOutput(false);
         Log.begin(LOG_LEVEL_SILENT, &SERIAL, true);
-        Log.setPrefix(printTimestamp);
+        Log.setPrefix(printPrefix);
     }
     else if (!app.copconfig.serial)
     {
         Serial.setDebugOutput(true);
         Log.begin(LOG_LEVEL, &SERIAL, true);
-        Log.setPrefix(printTimestamp);
+        Log.setPrefix(printPrefix);
         Log.notice(F("Local serial logging started at %l." CR), BAUD);
     }
 #endif
@@ -107,6 +107,11 @@ void serialRestart()
     serialBegin();
 }
 
+void printPrefix(Print* _logOutput, int logLevel) {
+    printTimestamp(_logOutput);
+    printLogLevel (_logOutput, logLevel);
+}
+
 void printTimestamp(Print *_logOutput)
 {
     time_t now;
@@ -118,6 +123,21 @@ void printTimestamp(Print *_logOutput)
     _logOutput->print(locTime);
 }
 
+void printLogLevel(Print* _logOutput, int logLevel) {
+    /// Show log description based on log level
+    switch (logLevel)
+    {
+        default:
+        case 0:_logOutput->print("SILENT " ); break;
+        case 1:_logOutput->print("FATAL "  ); break;
+        case 2:_logOutput->print("ERROR "  ); break;
+        case 3:_logOutput->print("WARNING "); break;
+        case 4:_logOutput->print("INFO "   ); break;
+        case 5:_logOutput->print("TRACE "  ); break;
+        case 6:_logOutput->print("VERBOSE "); break;
+    }   
+}
+
 size_t printDot()
 {
     return SERIAL.print(F("."));
@@ -524,7 +544,7 @@ void toggleSerialCompat(bool enable)
         SERIAL.flush();
         SERIAL.setDebugOutput(true);
         Log.begin(LOG_LEVEL, &SERIAL, true);
-        Log.setPrefix(printTimestamp);
+        Log.setPrefix(printPrefix);
         Log.notice(F("Serial communications (terse mode) disabled, debug print enabled." CR));
     }
     else

diff --git a/src/serialhandler.h b/src/serialhandler.h
@@ -34,7 +34,9 @@ void serialBegin();
 void serialStop();
 void serialRestart();
 void toggleSerialCompat(bool);
+void printPrefix(Print* _logOutput, int logLevel);
 void printTimestamp(Print *_logOutput);
+void printLogLevel(Print* _logOutput, int logLevel);
 void serialLoop();
 
 // Telnet Handlers