From ed3ff69fc82338be321ff397c8ba56997491ce1b Mon Sep 17 00:00:00 2001 From: fvanroie Date: Wed, 9 Mar 2022 11:14:40 +0100 Subject: [PATCH] Update to ArduinoJson 6.19.3 --- .vscode/extensions.json | 3 --- CHANGLELOG.md | 2 +- platformio.ini | 26 +++++++++++++++++++- 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 +- 6 files changed, 29 insertions(+), 8 deletions(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index d2311d2d..9a44568a 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -4,8 +4,5 @@ "recommendations": [ "ms-vscode.cpptools", "platformio.platformio-ide" - ], - "unwantedRecommendations": [ - "ms-vscode.cpptools-extension-pack" ] } diff --git a/CHANGLELOG.md b/CHANGLELOG.md index e9e0b476..d9029bb7 100644 --- a/CHANGLELOG.md +++ b/CHANGLELOG.md @@ -63,7 +63,7 @@ - Prepare support for ESP32-S2 - **Breaking:** Removed support for ESP8266! -Updated libraries to ArduinoJson 6.19.2, ArduinoStreamUtils 1.6.2, TFT_eSPI 2.4.42, LovyanGFX 0.4.12 and Adafruit STMPE610 1.1.4 +Updated libraries to ArduinoJson 6.19.3, ArduinoStreamUtils 1.6.2, TFT_eSPI 2.4.42, LovyanGFX 0.4.14 and Adafruit STMPE610 1.1.4 ## v0.6.2 diff --git a/platformio.ini b/platformio.ini index e2d0866b..2e45733a 100644 --- a/platformio.ini +++ b/platformio.ini @@ -74,7 +74,7 @@ build_flags = ; Warning : don't put comments after github links => causes infinite download loop lib_deps = bxparks/AceButton@^1.9.1 ; GPIO button library - bblanchon/ArduinoJson@^6.19.2 ; Json(l) parser + bblanchon/ArduinoJson@^6.19.3 ; Json(l) parser bblanchon/StreamUtils@^1.6.2 ; for EEPromStream and BufferedTelnetClient knolleary/PubSubClient@^2.8.0 ; MQTT client ;git+https://github.com/fvanroie/ConsoleInput.git @@ -95,3 +95,27 @@ lib_deps = ;https://github.com/me-no-dev/ESPAsyncTCP/archive/master.zip src_filter = +<*> -<.git/> - - - - - + +[lovyangfx] +lib_deps = + lovyan03/LovyanGFX @ ^0.4.14 + +[tft_espi] +lib_deps = + bodmer/TFT_eSPI @ 2.4.42 + +[goodix] +lib_deps = + git+https://github.com/netwizeBE/arduino-goodix.git + +[ft6336] +lib_deps = + git+https://github.com/aselectroworks/Arduino-FT6336U.git + +[gsl1680] +lib_deps = + git+https://github.com/arovak/GSL2038.git + +[stmpe610] +lib_deps = + adafruit/Adafruit STMPE610 @ ^1.1.4 \ No newline at end of file diff --git a/user_setups/darwin_sdl/darwin_sdl_64bits.ini b/user_setups/darwin_sdl/darwin_sdl_64bits.ini index 3c48963c..5adf997d 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.19.2 ; Json(l) parser + bblanchon/ArduinoJson@^6.19.3 ; 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 08a21c44..ebaa7aae 100644 --- a/user_setups/linux_sdl/linux_sdl_64bits.ini +++ b/user_setups/linux_sdl/linux_sdl_64bits.ini @@ -61,7 +61,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.19.2 ; Json(l) parser + bblanchon/ArduinoJson@^6.19.3 ; 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 b4693af7..e114f15c 100644 --- a/user_setups/win32/windows_sdl_64bits.ini +++ b/user_setups/win32/windows_sdl_64bits.ini @@ -92,7 +92,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.19.2 ; Json(l) parser + bblanchon/ArduinoJson@^6.19.3 ; Json(l) parser https://github.com/fvanroie/lv_drivers lib_ignore =