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

interface/src/framework/system/SystemLog.tsx

@@ -54,6 +54,8 @@ const levelLabel = (level: LogLevel) => {
       return 'NOTICE';
     case LogLevel.INFO:
       return 'INFO';
+    case LogLevel.DEBUG:
+      return 'DEBUG';
     case LogLevel.TRACE:
       return 'TRACE';
     default:
@@ -175,7 +177,7 @@ const SystemLog: FC = () => {
           justifyContent="flex-start"
           alignItems="center"
         >
-          <Grid item xs={2}>
+          <Grid item xs={4}>
             <TextField
               name="level"
               label={LL.LOG_LEVEL()}
@@ -194,7 +196,7 @@ const SystemLog: FC = () => {
               <MenuItem value={9}>ALL</MenuItem>
             </TextField>
           </Grid>
-          <Grid item xs={2}>
+          <Grid item xs={4}>
             <TextField
               name="max_messages"
               label={LL.BUFFER_SIZE()}
@@ -211,7 +213,7 @@ const SystemLog: FC = () => {
               <MenuItem value={100}>100</MenuItem>
             </TextField>
           </Grid>
-          <Grid item>
+          <Grid item xs={2}>
             <BlockFormControlLabel
               control={
                 <Checkbox
@@ -226,8 +228,7 @@ const SystemLog: FC = () => {
           <Box
             sx={{
               '& button, & a, & .MuiCard-root': {
-                mt: 3,
-                mx: 0.6
+                ml: 3
               }
             }}
           >
@@ -266,8 +267,7 @@ const SystemLog: FC = () => {
           {logEntries.map((e) => (
             <LogEntryLine key={e.i}>
               <span>{e.t}</span>
-              {data.compact && <span>{paddedLevelLabel(e.l)} </span>}
-              {!data.compact && <span>{paddedLevelLabel(e.l)}&nbsp;</span>}
+              <span>{paddedLevelLabel(e.l)}&nbsp;</span>
               <span>{paddedIDLabel(e.i)} </span>
               <span>{paddedNameLabel(e.n)} </span>
               <span>{e.m}</span>

interface/src/framework/system/UploadDownload.tsx

@@ -2,7 +2,7 @@ import { type FC, useState } from 'react';
 import { toast } from 'react-toastify';
 
 import DownloadIcon from '@mui/icons-material/GetApp';
-import { Box, Button, Link, Typography } from '@mui/material';
+import { Box, Button, Divider, Link, Typography } from '@mui/material';
 
 import * as SystemApi from 'api/system';
 
@@ -195,6 +195,8 @@ const UploadDownload: FC = () => {
         <Box p={2} border="2px solid grey" borderRadius={2}>
           {LL.VERSION_ON() + ' '}
           <b>{data.emsesp_version}</b>&nbsp;({data.esp_platform})
+          {data.model.length > 0 && <p>Gateway Hardware:&nbsp;{data.model}</p>}
+          <Divider />
           {latestVersion && (
             <Box mt={2}>
               {LL.THE_LATEST()}&nbsp;{LL.OFFICIAL()}&nbsp;{LL.RELEASE_IS()}

interface/src/project/Scheduler.tsx

@@ -244,7 +244,7 @@ const Scheduler: FC = () => {
         data={{
           nodes: schedule
             .filter((si) => !si.deleted)
-            .sort((a, b) => a.name.localeCompare(b.name))
+            .sort((a, b) => a.flags - b.flags)
         }}
         theme={schedule_theme}
         layout={{ custom: true }}

interface/src/project/validators.ts

@@ -287,6 +287,7 @@ export const uniqueNameValidator = (schedule: ScheduleItem[], o_name?: string) =
     callback: (error?: string) => void
   ) {
     if (
+      name !== '' &&
       (o_name === undefined || o_name !== name) &&
       name !== '' &&
       schedule.find((si) => si.name === name)
@@ -392,8 +393,8 @@ export const temperatureSensorItemValidation = () =>
     n: [
       {
         type: 'string',
-        pattern: /^[a-zA-Z0-9_\\.]{0,15}$/,
-        message: "Must be <15 characters: alpha numeric, '_' or '.'"
+        pattern: /^[a-zA-Z0-9_\\.]{0,17}$/,
+        message: "Must be <18 characters: alpha numeric, '_' or '.'"
       }
     ]
   });

interface/src/types/system.ts

@@ -24,6 +24,7 @@ export interface ESPSystemStatus {
   psram_size?: number;
   free_psram?: number;
   has_loader: boolean;
+  model: string;
 }
 
 export interface SystemStatus {