From b74066253cecb041e350a3303f481bd1e1208256 Mon Sep 17 00:00:00 2001 From: fvanroie Date: Thu, 13 Apr 2023 00:08:25 +0200 Subject: [PATCH] Update to ArduinoJson 6.21.2 --- CHANGLELOG.md | 6 +++++- platformio.ini | 4 ++-- user_setups/darwin_sdl/darwin_sdl_64bits.ini | 2 +- user_setups/linux_sdl/linux_sdl_64bits.ini | 2 +- user_setups/win32/windows_sdl_64bits.ini | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGLELOG.md b/CHANGLELOG.md index bb24ddfa..d98e2353 100644 --- a/CHANGLELOG.md +++ b/CHANGLELOG.md @@ -4,11 +4,15 @@ !!! THE PARTITION SCHEME OF THE INTERNAL FLASH HAS CHANGED !!! +### Commands +- Removed deprecated `dim`, `brightness` and `light` commands, use `backlight` instead + ### Objects - `action` and `swipe` can now be set to any command - Set default `line_width` of new `line` objects to 1 - Allow line and block comments in pages.jsonl +- Removed deprecated `txt` property, use `text` instead - HASP theme: Toggle objects now use the secondary color when they are in the toggled state. ### Fonts @@ -48,7 +52,7 @@ - Add support for ESP32-S3 devices - Deprication of support for ESP32-S2 devices due to lack of sRAM -Updated libraries to ArduinoJson 6.21.1, ArduinoStreamUtils 1.7.0, TFT_eSPI 2.5.0, LovyanGFX 1.1.2 and SimpleFTPServer 2.1.5 +Updated libraries to ArduinoJson 6.21.2, ArduinoStreamUtils 1.7.0, TFT_eSPI 2.5.0, LovyanGFX 1.1.2 and SimpleFTPServer 2.1.5 ## v0.6.3 diff --git a/platformio.ini b/platformio.ini index 8cc65c36..d614539e 100644 --- a/platformio.ini +++ b/platformio.ini @@ -15,7 +15,7 @@ extra_configs = user_setups/lcd_config.ini ; -- Base configurations per platform user_setups/esp32/_esp32.ini - user_setups/esp32s2/_esp32s2.ini + ;user_setups/esp32s2/_esp32s2.ini user_setups/esp32s3/_esp32s3.ini ; -- Put active [env] files in this dir to be included in the build menu user_setups/active/*.ini @@ -82,7 +82,7 @@ build_flags = ; -- Shared library dependencies in all environments ; Warning : don't put comments after github links => causes infinite download loop lib_deps = - bblanchon/ArduinoJson@^6.21.1 + bblanchon/ArduinoJson@^6.21.2 ;git+https://github.com/fvanroie/ConsoleInput.git ;git+https://github.com/andrethomas/TasmotaSlave.git ;git+https://github.com/lvgl/lvgl.git diff --git a/user_setups/darwin_sdl/darwin_sdl_64bits.ini b/user_setups/darwin_sdl/darwin_sdl_64bits.ini index 582b3ce2..0ecd5203 100644 --- a/user_setups/darwin_sdl/darwin_sdl_64bits.ini +++ b/user_setups/darwin_sdl/darwin_sdl_64bits.ini @@ -67,7 +67,7 @@ lib_deps = ; lv_drivers@~7.9.1 ;lv_drivers=https://github.com/littlevgl/lv_drivers/archive/7d71907c1d6b02797d066f50984b866e080ebeed.zip https://github.com/eclipse/paho.mqtt.c.git - bblanchon/ArduinoJson@^6.21.1 ; Json(l) parser + bblanchon/ArduinoJson@^6.21.2 ; Json(l) parser https://github.com/fvanroie/lv_drivers git+https://github.com/lvgl/lv_lib_png.git#release/v7 diff --git a/user_setups/linux_sdl/linux_sdl_64bits.ini b/user_setups/linux_sdl/linux_sdl_64bits.ini index 7c04f12b..b63f61c6 100644 --- a/user_setups/linux_sdl/linux_sdl_64bits.ini +++ b/user_setups/linux_sdl/linux_sdl_64bits.ini @@ -62,7 +62,7 @@ lib_deps = ;lv_drivers@~7.9.0 ;lv_drivers=https://github.com/littlevgl/lv_drivers/archive/7d71907c1d6b02797d066f50984b866e080ebeed.zip https://github.com/eclipse/paho.mqtt.c.git - bblanchon/ArduinoJson@^6.21.1 ; Json(l) parser + bblanchon/ArduinoJson@^6.21.2 ; Json(l) parser https://github.com/fvanroie/lv_drivers lib_ignore = diff --git a/user_setups/win32/windows_sdl_64bits.ini b/user_setups/win32/windows_sdl_64bits.ini index fee292af..3ce84888 100644 --- a/user_setups/win32/windows_sdl_64bits.ini +++ b/user_setups/win32/windows_sdl_64bits.ini @@ -93,7 +93,7 @@ lib_deps = ;lv_drivers@~7.9.0 ;lv_drivers=https://github.com/littlevgl/lv_drivers/archive/7d71907c1d6b02797d066f50984b866e080ebeed.zip https://github.com/eclipse/paho.mqtt.c.git - bblanchon/ArduinoJson@^6.21.1 ; Json(l) parser + bblanchon/ArduinoJson@^6.21.2 ; Json(l) parser https://github.com/fvanroie/lv_drivers lib_ignore =