Update ArduinoJson to 6.21.5

2025-07-27 21:26:43 +00:00 · 2024-02-22 16:19:28 +01:00 · 2024-02-22 16:19:28 +01:00 · ac6796b19d
commit ac6796b19d
parent 837061b380
7 changed files with 143 additions and 5 deletions
--- a/user_setups/darwin/darwin_sdl.ini
+++ b/user_setups/darwin/darwin_sdl.ini
@ -70,7 +70,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.4    ; Json(l) parser
+  bblanchon/ArduinoJson@^6.21.5    ; Json(l) parser
  https://github.com/fvanroie/lv_drivers
  git+https://github.com/lvgl/lv_lib_png.git#release/v7

--- a/user_setups/esp32s2/_esp32s2.ini
+++ b/user_setups/esp32s2/_esp32s2.ini
@ -5,6 +5,7 @@ board_build.mcu = esp32s2

 build_flags =
    ${env.build_flags}
+    -D HASP_TARGET_ARDUINO=1
    -D HTTP_UPLOAD_BUFLEN=512      ; lower http upload buffer
    -D MQTT_MAX_PACKET_SIZE=2048    ; longer PubSubClient messages
    -D HASP_CONSOLE_BUFFER=256      ; maximum length of a console/telnet command
--- a/user_setups/linux/linux_fbdev.ini
+++ b/user_setups/linux/linux_fbdev.ini
@ -58,7 +58,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.4    ; Json(l) parser
+  bblanchon/ArduinoJson@^6.21.5    ; Json(l) parser
  https://github.com/fvanroie/lv_drivers

 lib_ignore =
--- a/user_setups/linux/linux_sdl.ini
+++ b/user_setups/linux/linux_sdl.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.21.4    ; Json(l) parser
+  bblanchon/ArduinoJson@^6.21.5    ; Json(l) parser
  https://github.com/fvanroie/lv_drivers

 lib_ignore =
--- a/user_setups/win32/windows_gdi.ini
+++ b/user_setups/win32/windows_gdi.ini
@ -87,7 +87,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.4    ; Json(l) parser
+  bblanchon/ArduinoJson@^6.21.5    ; Json(l) parser
  https://github.com/fvanroie/lv_drivers

 lib_ignore =
--- a/user_setups/win32/windows_sdl.ini
+++ b/user_setups/win32/windows_sdl.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.4    ; Json(l) parser
+  bblanchon/ArduinoJson@^6.21.5    ; Json(l) parser
  https://github.com/fvanroie/lv_drivers

 lib_ignore =
--- a/user_setups/win32/windows_sdl_64bits.ini
+++ b/user_setups/win32/windows_sdl_64bits.ini
@ -0,0 +1,137 @@
+[env:windows_sdl_64bits]
+platform = native@^1.1.4
+extra_scripts = 
+  tools/sdl2_build_extra.py
+  tools/windows_build_extra.py
+build_flags =
+  ${env.build_flags}
+  -D HASP_MODEL="Windows App"
+
+  ; ----- Monitor
+  -D TFT_WIDTH=240
+  -D TFT_HEIGHT=320
+  ; SDL drivers options
+  ;-D LV_LVGL_H_INCLUDE_SIMPLE
+  ;-D LV_DRV_NO_CONF
+  -D USE_MONITOR
+  -D MONITOR_ZOOM=1  ; can be fractional like 1.5 or 2
+  -D USE_MOUSE
+  -D USE_MOUSEWHEEL
+  -D USE_KEYBOARD
+  ; ----- ArduinoJson
+  -D ARDUINOJSON_DECODE_UNICODE=1
+  -D HASP_NUM_PAGES=12
+  -D HASP_USE_SPIFFS=0
+  -D HASP_USE_LITTLEFS=0
+  -D HASP_USE_EEPROM=0
+  -D HASP_USE_GPIO=1
+  -D HASP_USE_CONFIG=0            ; Standalone application, as library
+  -D HASP_USE_DEBUG=1
+  -D HASP_USE_PNGDECODE=1
+  -D HASP_USE_BMPDECODE=1
+  -D HASP_USE_GIFDECODE=0
+  -D HASP_USE_JPGDECODE=0
+  -D HASP_USE_MQTT=1
+  -D HASP_USE_SYSLOG=0
+  -D MQTT_MAX_PACKET_SIZE=2048
+  -D HASP_ATTRIBUTE_FAST_MEM=
+  -D IRAM_ATTR=                      ; No IRAM_ATTR available
+  -D PROGMEM=                      ; No PROGMEM available
+  
+  ; -- FreeType build options ------------------------
+  -D LV_USE_FT_CACHE_MANAGER=1            ; crashes without cache
+  -D LVGL_FREETYPE_MAX_FACES=64           ; max number of FreeType faces in cache
+  -D LVGL_FREETYPE_MAX_SIZES=4            ; max number of sizes in cache
+  -D LVGL_FREETYPE_MAX_BYTES=16384        ; max bytes in cache
+  -D LVGL_FREETYPE_MAX_BYTES_PSRAM=65536  ; max bytes in cache when using PSRAM
+
+  ;-D LV_LOG_LEVEL=LV_LOG_LEVEL_INFO
+  ;-D LV_LOG_PRINTF=1
+  ; Add recursive dirs for hal headers search
+  -D _WIN64
+  -D WINDOWS              ; We add this ourselves for code branching in hasp
+  -D WIN32_LEAN_AND_MEAN  ; exclude a bunch of Windows header files from windows.h
+  -D PAHO_MQTT_STATIC
+  -DPAHO_WITH_SSL=TRUE
+  -DPAHO_BUILD_DOCUMENTATION=FALSE
+  -DPAHO_BUILD_SAMPLES=FALSE
+  -DCMAKE_BUILD_TYPE=Release
+  -DCMAKE_VERBOSE_MAKEFILE=TRUE
+  ;-D NO_PERSISTENCE
+  -I.pio/libdeps/windows_sdl_64bits/paho/src
+  -I.pio/libdeps/windows_sdl_64bits/ArduinoJson/src
+  -I lib/lv_fs_if
+  -I lib/lv_datetime
+  !python -c "import os; print(' '.join(['-I {}'.format(i[0].replace('\x5C','/')) for i in os.walk('hal/sdl2')]))"
+  -mconsole
+  ; ----- Statically linked libraries --------------------
+  -l"ws2_32"  ;windsock2
+  -lrpcrt4
+  -lcrypt32
+  -lmingw32
+  -lSDL2main
+  -lSDL2
+  -mwindows
+  -lm
+  -ldinput8
+  ;-ldxguid
+  ;-ldxerr8
+  ;-luser32
+  ;-lgdi32
+  -lwinmm
+  -limm32
+  -lole32
+  -loleaut32
+  ;-lshell32
+  -lversion
+  ;-luuid
+  -lsetupapi
+  ;-lhid
+
+lib_deps =
+  ${env.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.5    ; Json(l) parser
+  https://github.com/fvanroie/lv_drivers
+
+lib_ignore =
+  paho
+  AXP192
+  ArduinoLog
+  lv_lib_qrcode
+  ETHSPI
+
+build_src_filter =
+  +<*>
+  -<*.h>
+  +<../hal/sdl2>
+  +<../.pio/libdeps/windows_sdl_64bits/paho/src/*.c>
+  +<../.pio/libdeps/windows_sdl_64bits/paho/src/MQTTClient.c>
+  -<../.pio/libdeps/windows_sdl_64bits/paho/src/MQTTAsync.c>
+  -<../.pio/libdeps/windows_sdl_64bits/paho/src/MQTTAsyncUtils.c>
+  -<../.pio/libdeps/windows_sdl_64bits/paho/src/MQTTVersion.c>
+  -<../.pio/libdeps/windows_sdl_64bits/paho/src/SSLSocket.c>
+  +<MQTTClient.c>
+  -<MQTTAsync.c>
+  -<MQTTAsyncUtils.c>
+  -<MQTTVersion.c>
+  -<SSLSocket.c>
+  -<sys/>
+  +<sys/gpio/>
+  -<hal/>
+  +<drv/>
+  -<drv/touch>
+  +<drv/tft>
+  +<dev/>
+  -<hal/>
+  -<svc/>
+  -<hasp_filesystem.cpp>
+  +<font/>
+  +<hasp/>
+  +<lang/>
+  -<log/>
+  +<mqtt/>
+  +<../.pio/libdeps/windows_sdl_64bits/ArduinoJson/src/ArduinoJson.h>
+  +<lib/lv_datetime>