Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev

Author: proddy

.github/workflows/pre_release.yml

@@ -52,4 +52,8 @@ jobs:
           files: |
             CHANGELOG_LATEST.md
             ./build/firmware/*.*
-            
+<<<<<<< HEAD
+            
+=======
+            
+>>>>>>> fdbbfe8ddbbb49c610cf6ab68a0d11bc3c9855b1

interface/src/system/LogEventConsole.tsx

@@ -87,8 +87,8 @@ const LogEventConsole: FC<LogEventConsoleProps> = (props) => {
         return 'NOTICE';
       case LogLevel.WARNING:
         return 'WARNING';
-      case LogLevel.TRACE:
-        return 'TRACE';
+      case LogLevel.ALL:
+        return 'ALL';
       default:
         return '?';
     }

interface/src/system/LogEventForm.tsx

@@ -87,7 +87,7 @@ class LogEventForm extends Component<LogEventFormProps> {
               <MenuItem value={5}>NOTICE</MenuItem>
               <MenuItem value={6}>INFO</MenuItem>
               <MenuItem value={7}>DEBUG</MenuItem>
-              <MenuItem value={8}>TRACE</MenuItem>
+              <MenuItem value={8}>ALL</MenuItem>
             </SelectValidator>
           </Grid>
           <Grid item md>

interface/src/system/types.ts

@@ -43,7 +43,7 @@ export enum LogLevel {
   NOTICE = 5,
   INFO = 6,
   DEBUG = 7,
-  TRACE = 8
+  ALL = 9
 }
 
 export interface LogEvent {