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

interface/package.json

@@ -28,7 +28,7 @@
     "@remix-run/router": "^1.4.0",
     "@table-library/react-table-library": "4.1.0",
     "@types/lodash-es": "^4.17.7",
-    "@types/node": "^18.15.5",
+    "@types/node": "^18.15.7",
     "@types/react": "^18.0.28",
     "@types/react-dom": "^18.0.11",
     "@types/react-router-dom": "^5.3.3",
@@ -68,7 +68,7 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "nodemon": "^2.0.22",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.8.6",
+    "prettier": "^2.8.7",
     "rollup-plugin-visualizer": "^5.9.0",
     "terser": "^5.16.6",
     "vite": "^4.2.1",

interface/src/framework/mqtt/MqttSettingsForm.tsx

@@ -190,7 +190,14 @@ const MqttSettingsForm: FC = () => {
           label={LL.MQTT_RESPONSE()}
         />
         {!data.ha_enabled && (
-          <Grid container rowSpacing={-1} spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
+          <Grid
+            container
+            rowSpacing={-1}
+            spacing={1}
+            direction="row"
+            justifyContent="flex-start"
+            alignItems="flex-start"
+          >
             <Grid item>
               <BlockFormControlLabel
                 control={<Checkbox name="publish_single" checked={data.publish_single} onChange={updateFormValue} />}
@@ -218,7 +225,14 @@ const MqttSettingsForm: FC = () => {
               />
             </Grid>
             {data.ha_enabled && (
-              <Grid container sx={{ pl: 1 }} spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
+              <Grid
+                container
+                sx={{ pl: 1 }}
+                spacing={1}
+                direction="row"
+                justifyContent="flex-start"
+                alignItems="flex-start"
+              >
                 <Grid item xs={12} sm={6} md={4}>
                   <ValidatedTextField
                     name="discovery_type"

interface/src/project/SettingsApplication.tsx

@@ -430,7 +430,15 @@ const SettingsApplication: FC = () => {
             disabled={!data.shower_timer}
           />
         </Grid>
-          <Grid container sx={{ pt: 2 }} rowSpacing={3} spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
+        <Grid
+          container
+          sx={{ pt: 2 }}
+          rowSpacing={3}
+          spacing={1}
+          direction="row"
+          justifyContent="flex-start"
+          alignItems="flex-start"
+        >
           {data.shower_alert && (
             <>
               <Grid item xs={12} sm={6}>

interface/yarn.lock

@@ -1343,10 +1343,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^18.15.5":
+"@types/node@npm:^18.15.7":
-  version: 18.15.5
+  version: 18.15.7
-  resolution: "@types/node@npm:18.15.5"
+  resolution: "@types/node@npm:18.15.7"
-  checksum: 5fbf3453bd5ce1402bb2964e55d928fc8a8a7de5451b1b0fe66587fecb8a3eb86854ca9cefa5076a5971e2cff00e1773ceeb5d872a54f6c6ddfbbc1064b4e91a
+  checksum: 08d1dd1898be10cd274955ed7f491bcab5b7e70ce66b6a1e996a582d5467f7517046b0d9c5f4e15871df94dd72d1ad9e7be236d2cff1a1450ec906d7fa3062d2
   languageName: node
   linkType: hard
 
@@ -1802,7 +1802,7 @@ __metadata:
     "@table-library/react-table-library": 4.1.0
     "@types/lodash-es": ^4.17.7
     "@types/mime-types": ^2
-    "@types/node": ^18.15.5
+    "@types/node": ^18.15.7
     "@types/react": ^18.0.28
     "@types/react-dom": ^18.0.11
     "@types/react-router-dom": ^5.3.3
@@ -1830,7 +1830,7 @@ __metadata:
     mime-types: ^2.1.35
     nodemon: ^2.0.22
     npm-run-all: ^4.1.5
-    prettier: ^2.8.6
+    prettier: ^2.8.7
     react: latest
     react-dom: latest
     react-dropzone: ^14.2.3
@@ -5260,12 +5260,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:^2.8.6":
+"prettier@npm:^2.8.7":
-  version: 2.8.6
+  version: 2.8.7
-  resolution: "prettier@npm:2.8.6"
+  resolution: "prettier@npm:2.8.7"
   bin:
     prettier: bin-prettier.js
-  checksum: 8ac94fa67aec0e65743ea15ebf954ef2f1e52638abd129dc04e8b49e8bb3224c0233c98df6b5c98efd31bd2a43866590486559438ee4ead09dc81be389068572
+  checksum: fdc8f2616f099f5f0d685907f4449a70595a0fc1d081a88919604375989e0d5e9168d6121d8cc6861f21990b31665828e00472544d785d5940ea08a17660c3a6
   languageName: node
   linkType: hard
 

src/version.h

@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.6.0-dev.7"
+#define EMSESP_APP_VERSION "3.6.0-dev.8"

src/web/WebSchedulerService.cpp

@@ -38,7 +38,6 @@ void WebSchedulerService::begin() {
 void WebScheduler::read(WebScheduler & webScheduler, JsonObject & root) {
     JsonArray schedule = root.createNestedArray("schedule");
     uint8_t   counter  = 0;
-    char      s[3];
     for (const ScheduleItem & scheduleItem : webScheduler.scheduleItems) {
         JsonObject si = schedule.createNestedObject();
         si["id"]      = counter++; // id is only used to render the table and must be unique