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

interface/.yarnrc.yml

@@ -4,4 +4,4 @@ enableGlobalCache: false
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.0.0.cjs
+yarnPath: .yarn/releases/yarn-4.0.1.cjs

interface/package.json

@@ -73,5 +73,5 @@
     "vite-plugin-imagemin": "^0.6.1",
     "vite-tsconfig-paths": "^4.2.1"
   },
-  "packageManager": "yarn@4.0.0"
+  "packageManager": "yarn@4.0.1"
 }

interface/src/api/authentication.ts

@@ -1,4 +1,4 @@
-import { jwtDecode } from "jwt-decode";
+import { jwtDecode } from 'jwt-decode';
 import { ACCESS_TOKEN, alovaInstance } from './endpoints';
 import type * as H from 'history';
 import type { Path } from 'react-router-dom';

mock-api/.yarnrc.yml

@@ -4,4 +4,4 @@ enableGlobalCache: false
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.0.0.cjs
+yarnPath: .yarn/releases/yarn-4.0.1.cjs

mock-api/package.json

@@ -15,5 +15,5 @@
     "express": "^4.18.2",
     "multer": "^1.4.5-lts.1"
   },
-  "packageManager": "yarn@4.0.0"
+  "packageManager": "yarn@4.0.1"
 }

platformio.ini

@@ -33,7 +33,7 @@ build_flags =
   -D NO_GLOBAL_ARDUINOOTA
   -D ARDUINOJSON_ENABLE_STD_STRING=1
   -D ARDUINOJSON_USE_DOUBLE=0
-  ;-D CONFIG_UART_ISR_IN_IRAM
+  ; -D CONFIG_UART_ISR_IN_IRAM
 
 unbuild_flags =
   ${common.core_unbuild_flags}
@@ -41,6 +41,7 @@ unbuild_flags =
 [espressi32_base]
 platform = espressif32@6.4.0
 framework = arduino
+board_build.filesystem = littlefs
 build_flags = ${common.build_flags}
 build_unflags = ${common.unbuild_flags}
 extra_scripts =
@@ -49,10 +50,11 @@ extra_scripts =
 
 [espressi32_base_tasmota]
 ; use Tasmota's libary which removes some libs (like mbedtsl) and increases available heap
-; based on Core 2.0.12/ESP-IDF v4.4.5 https://github.com/espressif/arduino-esp32/releases/tag/2.0.12 use https://github.com/tasmota/platform-espressif32/archive/refs/tags/2023.09.00.zip
+; platform = https://github.com/tasmota/platform-espressif32.git ; latest development
-; based on Core 2.0.13/ESP-IDF v4.4.5 https://github.com/espressif/arduino-esp32/releases/tag/2.0.13 use https://github.com/tasmota/platform-espressif32/releases/download/2023.09.01/platform-espressif32-2023.09.01.zip
+platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.10.03/platform-espressif32-2023.10.03.zip ; latest stable
-platform = https://github.com/tasmota/platform-espressif32/archive/refs/tags/2023.10.03.zip
+; platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.10.02/platform-espressif32.zip
 framework = arduino
+board_build.filesystem = littlefs
 build_flags = ${common.build_flags}
 build_unflags = ${common.unbuild_flags}
 extra_scripts =
@@ -80,7 +82,6 @@ extends = espressi32_base_tasmota
 extra_scripts = scripts/rename_fw.py
 board = esp32dev
 board_build.partitions = esp32_partition_4M.csv
-board_build.filesystem = littlefs
 board_build.extra_flags = -DBOARD_HAS_PSRAM
 build_flags = ${common.build_flags}
 build_unflags = ${common.unbuild_flags}
@@ -92,7 +93,9 @@ board = lolin_s3
 board_build.f_cpu = 240000000L
 board_upload.flash_size = 16MB
 board_build.partitions = esp32_partition_16M.csv
-build_flags = ${common.build_flags} -O2
+build_flags =
+  ${common.build_flags}
+  -O2
 build_unflags = ${common.unbuild_flags}
 
 [env:esp32_4M]
@@ -100,7 +103,9 @@ extends = espressi32_base_tasmota
 board = esp32dev
 board_upload.flash_size = 4MB
 board_build.partitions = esp32_partition_4M.csv
-build_flags = ${common.build_flags} -Os
+build_flags =
+  ${common.build_flags}
+  -Os
 
 [env:esp32_4Mplus]
 extends = espressi32_base_tasmota
@@ -121,7 +126,7 @@ build_flags = ${common.build_flags}
 extends = espressi32_base_tasmota
 board = lolin_c3_mini
 board_upload.flash_size = 4MB
-board_build.partitions = esp32_asym_partition_4M.csv
+board_build.partitions = esp32_partition_4M.csv
 build_flags = ${common.build_flags}
 
 ; lolin C3 mini v1 needs special wifi init.
@@ -130,14 +135,16 @@ build_flags = ${common.build_flags}
 extends = espressi32_base_tasmota
 board = lolin_c3_mini
 board_upload.flash_size = 4MB
-board_build.partitions = esp32_asym_partition_4M.csv
+board_build.partitions = esp32_partition_4M.csv
-build_flags = ${common.build_flags} -DBOARD_C3_MINI_V1
+build_flags =
+  ${common.build_flags}
+  -DBOARD_C3_MINI_V1
 
 [env:lolin_s2_mini]
 extends = espressi32_base_tasmota
 board = lolin_s2_mini
 board_upload.flash_size = 4MB
-board_build.partitions = esp32_asym_partition_4M.csv
+board_build.partitions = esp32_partition_4M.csv
 build_flags = ${common.build_flags}
 
 [env:lolin_s3]
@@ -148,7 +155,9 @@ board_upload.flash_size = 16MB
 board_build.partitions = esp32_partition_16M.csv
 board_upload.use_1200bps_touch = false
 board_upload.wait_for_upload_port = false
-build_flags = ${common.build_flags} -O2
+build_flags =
+  ${common.build_flags}
+  -O2
 
 ; to build and run: pio run -e standalone -t exec
 [env:standalone]

scripts/api_test.http

@@ -1,6 +1,7 @@
 # testing EMS-ESP API
-# use with "REST Client" extension in Visual Studio Code
+# to be used with "REST Client" extension in Visual Studio Code (https://marketplace.visualstudio.com/items?itemName=humao.rest-client)
-# https://marketplace.visualstudio.com/items?itemName=humao.rest-client
+# Open this file in VSC, modify the token, go to the API call and click on 'Send Request' (or Ctrl+Alt+R)
+# The response will be shown in the right panel
 
 @host = http://ems-esp.local
 @host_dev = http://ems-esp2.local

src/version.h

@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.6.3-dev.4g"
+#define EMSESP_APP_VERSION "3.6.3-dev.5a"