Merge pull request #143 from pkendall64/upgrade-dependencies

Upgrade dependencies
ExpressLRS · Aug 2, 2024 · 7c74ed1 · 7c74ed1
2 parents be1988e + c1d939e
commit 7c74ed1
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 16 deletions.
diff --git a/lib/WIFI/devWIFI.cpp b/lib/WIFI/devWIFI.cpp
@@ -176,12 +176,7 @@ static void WebUpdateHandleRoot(AsyncWebServerRequest *request)
 
 static void GetConfiguration(AsyncWebServerRequest *request)
 {
-#if defined(PLATFORM_ESP32)
-  DynamicJsonDocument json(32768);
-#else
-  DynamicJsonDocument json(2048);
-#endif
-
+  JsonDocument json;
   json["config"]["ssid"] = station_ssid;
   json["config"]["mode"] = wifiMode == WIFI_STA ? "STA" : "AP";
   json["config"]["product_name"] = firmwareOptions.product_name;

diff --git a/src/options.cpp b/src/options.cpp
@@ -39,7 +39,7 @@ String& getOptions()
 
 void saveOptions(Stream &stream, bool customised)
 {
-    DynamicJsonDocument doc(1024);
+    JsonDocument doc;
 
     if (firmwareOptions.hasUID)
     {
@@ -86,8 +86,8 @@ bool options_HasStringInFlash(EspFlashStream &strmFlash)
  */
 static void options_LoadFromFlashOrFile(EspFlashStream &strmFlash)
 {
-    DynamicJsonDocument flashDoc(1024);
-    DynamicJsonDocument spiffsDoc(1024);
+    JsonDocument flashDoc;
+    JsonDocument spiffsDoc;
     bool hasFlash = false;
     bool hasSpiffs = false;
 
@@ -113,7 +113,7 @@ static void options_LoadFromFlashOrFile(EspFlashStream &strmFlash)
         }
     }
 
-    DynamicJsonDocument &doc = flashDoc;
+    JsonDocument &doc = flashDoc;
     if (hasFlash && hasSpiffs)
     {
         if (flashDoc["flash-discriminator"] == spiffsDoc["flash-discriminator"])

diff --git a/targets/common.ini b/targets/common.ini
@@ -1,15 +1,15 @@
 # ------------------------- COMMON ENV DEFINITIONS -----------------
 [env]
-platform = [email protected].0
+platform = [email protected].1
 framework = arduino
 extra_scripts =
 	pre:python/build_flags.py
 	python/build_env_setup.py
 	pre:python/build_html.py
 lib_deps =
-	ottowinter/ESPAsyncWebServer-esphome @ 3.0.0
-	esphome/AsyncTCP-esphome @ 2.0.1 # use specific version - an update to this library breaks the build
-	bblanchon/ArduinoJson @ 6.19.4
+	ottowinter/ESPAsyncWebServer-esphome @ 3.2.2
+	esphome/AsyncTCP-esphome @ 2.1.3 # use specific version - an update to this library breaks the build
+	bblanchon/ArduinoJson @ 7.1.0
 
 [common_env_data]
 build_src_filter = +<*> -<.git/> -<svn/> -<example/> -<examples/> -<test/> -<tests/> -<*.py> -<*test*.*>
@@ -49,7 +49,7 @@ build_flags =
 
 # ------------------------- COMMON ESP32 DEFINITIONS -----------------
 [env_common_esp32c3]
-platform = espressif32@6.4.0
+platform = espressif32@6.7.0
 board = esp32-c3-devkitm-1
 board_build.partitions = min_spiffs.csv
 upload_speed = 460800

diff --git a/targets/debug.ini b/targets/debug.ini
@@ -4,11 +4,11 @@
 
 [env:DEBUG_ESP_RX_Backpack_via_UART]
 extends = env_common_esp8285, steadyview_vrx_backpack_common
+upload_resetmethod = nodemcu
 build_flags =
 	${env_common_esp8285.build_flags}
 	${steadyview_vrx_backpack_common.build_flags}
 	-D DEBUG_LOG
-	-D DEBUG_ELRS_WIFI
 	-D PIN_LED=16
 	-D PIN_MOSI=12	;Some pin (not a UART)
 	-D PIN_CLK=0 	;Boot pad
@@ -17,6 +17,21 @@ build_flags =
 [env:DEBUG_ESP_RX_Backpack_via_WIFI]
 extends = env:DEBUG_ESP_RX_Backpack_via_UART
 
+[env:DEBUG_ESP32_RX_Backpack_via_UART]
+extends = env_common_esp32, steadyview_vrx_backpack_common
+upload_resetmethod = nodemcu
+build_flags =
+	${env_common_esp32.build_flags}
+	${steadyview_vrx_backpack_common.build_flags}
+	-D DEBUG_LOG
+	-D PIN_LED=2
+	-D PIN_MOSI=18	;Some pin (not a UART)
+	-D PIN_CLK=19 	;Boot pad
+	-D PIN_CS=5	;Some other pin (not a UART)
+
+[env:DEBUG_ESP32_RX_Backpack_via_WIFI]
+extends = env:DEBUG_ESP32_RX_Backpack_via_UART
+
 # ********************************
 # Transmitter backpack targets
 # ********************************
@@ -41,6 +56,7 @@ extends = env_common_esp32, tx_backpack_common
 build_flags =
 	${env_common_esp32.build_flags}
 	${tx_backpack_common.build_flags}
+	-D DEBUG_LOG
 	-D PIN_BUTTON=0
 	-D PIN_LED=4
 lib_ignore = STM32UPDATE