Merge pull request #1539 from proddy/dev

ArduinoJson version 7.0.0 - #1538
emsesp · Jan 5, 2024 · f365fe5 · f365fe5
2 parents 13a915e + 19eb755
commit f365fe5
Show file tree

Hide file tree

Showing 220 changed files with 3,911 additions and 4,450 deletions.
diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md
@@ -13,6 +13,7 @@
 - added SK (Slovenian) language. Thanks @misa1515
 - CPU info [#1497](https://github.com/emsesp/EMS-ESP32/pull/1497)
 - Show network hostname in Web UI under Network Status
+- Improved HA Discovery so each section (EMS device, Scheduler, Analog, Temperature, Custom, Shower) have their own section
 
 ## Fixed
 
@@ -25,3 +26,4 @@
 ## Changed
 
 - HA don't set entity_category to Diagnostic/Configuration for EMS entities [#1459](https://github.com/emsesp/EMS-ESP32/discussions/1459)
+- Upgraded ArduinoJson to 7.0.0 #1538
diff --git a/interface/package.json b/interface/package.json
@@ -70,7 +70,7 @@
     "prettier": "^3.1.1",
     "rollup-plugin-visualizer": "^5.12.0",
     "terser": "^5.26.0",
-    "vite": "^5.0.10",
+    "vite": "^5.0.11",
     "vite-plugin-imagemin": "^0.6.1",
     "vite-tsconfig-paths": "^4.2.3"
   },

diff --git a/interface/src/framework/system/SystemStatusForm.tsx b/interface/src/framework/system/SystemStatusForm.tsx
@@ -227,6 +227,8 @@ const SystemStatusForm: FC = () => {
             <ListItemText
               primary="CPU"
               secondary={
+                data.esp_platform +
+                '/' +
                 data.cpu_type +
                 ' (rev.' +
                 data.cpu_rev +

diff --git a/interface/src/project/DashboardSensors.tsx b/interface/src/project/DashboardSensors.tsx
@@ -262,7 +262,7 @@ const DashboardSensors: FC = () => {
     setSelectedAnalogSensor({
       id: Math.floor(Math.random() * (Math.floor(200) - 100) + 100),
       n: '',
-      g: 40,
+      g: 21, // default GPIO 21 which is safe for all platforms
       u: 0,
       v: 0,
       o: 0,

diff --git a/interface/yarn.lock b/interface/yarn.lock
@@ -1873,7 +1873,7 @@ __metadata:
     terser: "npm:^5.26.0"
     typesafe-i18n: "npm:^5.26.2"
     typescript: "npm:^5.3.3"
-    vite: "npm:^5.0.10"
+    vite: "npm:^5.0.11"
     vite-plugin-imagemin: "npm:^0.6.1"
     vite-tsconfig-paths: "npm:^4.2.3"
   languageName: unknown
@@ -8771,9 +8771,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:^5.0.10":
-  version: 5.0.10
-  resolution: "vite@npm:5.0.10"
+"vite@npm:^5.0.11":
+  version: 5.0.11
+  resolution: "vite@npm:5.0.11"
   dependencies:
     esbuild: "npm:^0.19.3"
     fsevents: "npm:~2.3.3"
@@ -8807,7 +8807,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 5421e9c7f8cf3152eace9a8b528269141635f367e5dc63c5f1fe2712a766d9757f8197733cf3f28be590afdd520130d38de90c955e6dba6edfa6f9056c1e5ea7
+  checksum: f1a8fea35ed9f162d7a10fd13efb2c96637028b0a319d726aeec8b31e20e4d047272bda5df82167618e7774a520236c66f3093ed172802660aec5227814072f4
   languageName: node
   linkType: hard
 

diff --git a/lib/ArduinoJson/.clang-format b/lib/ArduinoJson/.clang-format
@@ -0,0 +1,12 @@
+# http://clang.llvm.org/docs/ClangFormatStyleOptions.html
+
+BasedOnStyle: Google
+Standard: c++11
+AllowShortFunctionsOnASingleLine: Empty
+IncludeBlocks: Preserve
+IndentPPDirectives: AfterHash
+DerivePointerAlignment: false
+
+# Always break after if to get accurate coverage
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
diff --git a/lib/ArduinoJson/.prettierignore b/lib/ArduinoJson/.prettierignore
@@ -0,0 +1 @@
+*.md
diff --git a/lib/ArduinoJson/ArduinoJson.h b/lib/ArduinoJson/ArduinoJson.h
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include "src/ArduinoJson.h"
-Original file line number
+Diff line change
@@ Expand Up / @@ -262,7 +262,7 @@ const DashboardSensors: FC = () => { @@
         setSelectedAnalogSensor({
           id: Math.floor(Math.random() * (Math.floor(200) - 100) + 100),
           n: '',
-          g: 40,
+          g: 21, // default GPIO 21 which is safe for all platforms
           u: 0,
           v: 0,
           o: 0,
@@ Expand Down @@