From c3ed81a4cf014fc838bd75cd1704ea7bc8206a5a Mon Sep 17 00:00:00 2001
From: fvanroie <15969459+fvanroie@users.noreply.github.com>
Date: Fri, 14 Jan 2022 16:32:56 +0100
Subject: [PATCH] Update to ArduinoJson 6.19.1

---
 CHANGLELOG.md                                | 16 +++++++++++-----
 platformio.ini                               |  2 +-
 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, 15 insertions(+), 9 deletions(-)

diff --git a/CHANGLELOG.md b/CHANGLELOG.md
index 3adf1b58..5ad2e50d 100644
--- a/CHANGLELOG.md
+++ b/CHANGLELOG.md
@@ -6,6 +6,7 @@
 - Use FreeType fonts from flash
 - Use LVGL binary fonts from flash, loaded into PSram
 - Removed defunct .zi font support
+- Added Vietnamese encoding (thanks @kydang789)
 - ~~Breaking: The UTF codes for the built-in icons have changed from the previous list!~~
 - Font ID is replaced by `namexx` (`where xx is the size`) but the previous Font ID still works for backwards compatibility
 
@@ -13,20 +14,25 @@
 - Updated to modern responsive design
 - Allow for a customizible `vars.css`, `style.css`, `script.js` and `edit.htm`
 - _Selectable dark/light theme?_
+- Add checkbox to toggle ANSI codes (thanks @geiseri)
+- Display info message when configuration is changed and reboot is needed
 
-### Commands
+### GUI
 - Hide cursor during `antiburn` and `idle` if the pointer is enabled
 
 ### Custom component
-- Expose `antiburn` for the CC
-- Expose the device URL in discovery messages
+- Expose `antiburn` for the CC (thanks @dgomes)
+- Expose the device URL in discovery message
+- Add display resolution to discovery message
 
 ### Architecture
-- Moved to Arduino 2.0 with native LittleFS library
+- Moved to Arduino 2.0.2 with native LittleFS library
 - Moved to ESP-IDF 4.4 with fix for FragAttacks CVEs
-- Prepare support for ESP32S2
+- Prepare support for ESP32-S2
 - Breaking: Removed support for ESP8266
 
+Updated ArduinoJson to 6.19.1
+
 
 ## v0.6.2
 
diff --git a/platformio.ini b/platformio.ini
index 33c0ee7b..434c95bf 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -72,7 +72,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.0    ; Json(l) parser
+    bblanchon/ArduinoJson@^6.19.1    ; Json(l) parser
     bblanchon/StreamUtils@1.6.1      ; for EEPromStream
     knolleary/PubSubClient@^2.8.0    ; MQTT client
     git+https://github.com/fvanroie/ConsoleInput.git
diff --git a/user_setups/darwin_sdl/darwin_sdl_64bits.ini b/user_setups/darwin_sdl/darwin_sdl_64bits.ini
index 6555c8c6..1401c160 100644
--- a/user_setups/darwin_sdl/darwin_sdl_64bits.ini
+++ b/user_setups/darwin_sdl/darwin_sdl_64bits.ini
@@ -69,7 +69,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.17.2    ; Json(l) parser
+  bblanchon/ArduinoJson@^6.19.1    ; 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 9c087211..452cb979 100644
--- a/user_setups/linux_sdl/linux_sdl_64bits.ini
+++ b/user_setups/linux_sdl/linux_sdl_64bits.ini
@@ -63,7 +63,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.17.2    ; Json(l) parser
+  bblanchon/ArduinoJson@^6.19.1    ; 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 0c88190f..71794884 100644
--- a/user_setups/win32/windows_sdl_64bits.ini
+++ b/user_setups/win32/windows_sdl_64bits.ini
@@ -94,7 +94,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.17.2    ; Json(l) parser
+  bblanchon/ArduinoJson@^6.19.1    ; Json(l) parser
   https://github.com/fvanroie/lv_drivers
 
 lib_ignore =