From 4acda5baf571c69f4c1b1b0dea6386f9d6ad663f Mon Sep 17 00:00:00 2001 From: folkert van heusden Date: Thu, 16 May 2024 10:20:58 +0200 Subject: [PATCH] ESP32 compile fix --- ESP32/disk_backend_esp32.cpp | 4 ++-- ESP32/disk_backend_esp32.h | 2 +- ESP32/platformio.ini | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ESP32/disk_backend_esp32.cpp b/ESP32/disk_backend_esp32.cpp index 0fc42d5..e71d3cf 100644 --- a/ESP32/disk_backend_esp32.cpp +++ b/ESP32/disk_backend_esp32.cpp @@ -24,9 +24,9 @@ disk_backend_esp32::~disk_backend_esp32() delete fh; } -JsonVariant disk_backend_esp32::serialize() const +JsonDocument disk_backend_esp32::serialize() const { - JsonVariant j; + JsonDocument j; j["disk-backend-type"] = "esp32"; diff --git a/ESP32/disk_backend_esp32.h b/ESP32/disk_backend_esp32.h index bc79117..ec3cd37 100644 --- a/ESP32/disk_backend_esp32.h +++ b/ESP32/disk_backend_esp32.h @@ -23,7 +23,7 @@ public: disk_backend_esp32(const std::string & filename); virtual ~disk_backend_esp32(); - JsonVariant serialize() const override; + JsonDocument serialize() const override; static disk_backend_esp32 *deserialize(const JsonVariantConst j); std::string get_identifier() const { return filename; } diff --git a/ESP32/platformio.ini b/ESP32/platformio.ini index fb82f77..c647c9e 100644 --- a/ESP32/platformio.ini +++ b/ESP32/platformio.ini @@ -16,7 +16,7 @@ upload_speed = 1000000 board_build.filesystem = littlefs lib_deps = greiman/SdFat@^2.1.2 adafruit/Adafruit NeoPixel - bblanchon/ArduinoJson@^6.19.4 + bblanchon/ArduinoJson@^7.0.4 build_flags = -std=gnu++2a -DESP32=1 -ggdb3 -D_GLIBCXX_USE_C99 -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -DCONFIG_SPIRAM_USE_MALLOC -DRGBW_PIXELS -fexceptions build_unflags = -std=gnu++11 -std=gnu++17 extra_scripts = pre:prepare.py @@ -31,7 +31,7 @@ upload_speed = 460800 board_build.filesystem = littlefs lib_deps = greiman/SdFat@^2.1.2 adafruit/Adafruit NeoPixel - bblanchon/ArduinoJson@^6.19.4 + bblanchon/ArduinoJson@^7.0.4 build_flags = -std=gnu++2a -DESP32=1 -DSHA2017 -ggdb3 -D_GLIBCXX_USE_C99 -ISHAdisplay/Arduino/libraries/epd2in9-badge -ISHAdisplay/Arduino/libraries/epdpaint -ISHAdisplay/components/epaper-29-dke -fexceptions build_unflags = -std=gnu++11 -std=gnu++17 upload_protocol = esptool @@ -46,7 +46,7 @@ upload_speed = 1000000 board_build.filesystem = littlefs lib_deps = greiman/SdFat@^2.1.2 adafruit/Adafruit NeoPixel - bblanchon/ArduinoJson@^6.19.4 + bblanchon/ArduinoJson@^7.0.4 build_flags = -std=gnu++17 -DESP32=1 -ggdb3 -D_GLIBCXX_USE_C99 -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -DCONFIG_SPIRAM_USE_MALLOC -DTTY_SERIAL_RX=4 -DTTY_SERIAL_TX=15 -fexceptions build_unflags = -std=gnu++11 extra_scripts = pre:prepare.py @@ -61,7 +61,7 @@ upload_speed = 1000000 board_build.filesystem = littlefs lib_deps = greiman/SdFat@^2.1.2 adafruit/Adafruit NeoPixel - bblanchon/ArduinoJson@^6.19.4 + bblanchon/ArduinoJson@^7.0.4 build_flags = -std=gnu++17 -DESP32=1 -ggdb3 -D_GLIBCXX_USE_C99 -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -DCONFIG_SPIRAM_USE_MALLOC -fexceptions build_unflags = -std=gnu++11 extra_scripts = pre:prepare.py @@ -76,7 +76,7 @@ upload_speed = 1000000 board_build.filesystem = littlefs lib_deps = greiman/SdFat@^2.1.2 adafruit/Adafruit NeoPixel - bblanchon/ArduinoJson@^6.19.4 + bblanchon/ArduinoJson@^7.0.4 build_flags = -std=gnu++17 -DESP32=1 -ggdb3 -D_GLIBCXX_USE_C99 -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -DCONFIG_SPIRAM_USE_MALLOC -DTTY_SERIAL_TX=17 -DTTY_SERIAL_RX=18 -DNEOPIXELS_PIN=40 -fexceptions build_unflags = -std=gnu++11 extra_scripts = pre:prepare.py