Update ArduinoJson to v7

Merge remote-tracking branch 'origin/develop'
Fix OTA filename determination to use unified format for ESP32 (#9488 )
2026-02-02 15:11:48 +00:00 · 2026-01-30 19:56:43 +00:00 · 2026-01-30 13:56:11 -06:00 · 2026-01-30 13:46:11 -06:00
4 changed files with 6 additions and 20 deletions
--- a/bin/device-install.bat
+++ b/bin/device-install.bat
@@ -156,16 +156,8 @@ IF %BPS_RESET% EQU 1 (
 SET "PROGNAME=!FILENAME:.factory.bin=!"
 CALL :LOG_MESSAGE DEBUG "Computed PROGNAME: !PROGNAME!"

-IF "__!MCU!__" == "__esp32s3__" (
-    @REM We are working with ESP32-S3
-    SET "OTA_FILENAME=bleota-s3.bin"
-) ELSE IF "__!MCU!__" == "__esp32c3__" (
-    @REM We are working with ESP32-C3
-    SET "OTA_FILENAME=bleota-c3.bin"
-) ELSE (
-    @REM Everything else
-    SET "OTA_FILENAME=bleota.bin"
-)
+@REM Determine OTA filename based on MCU type (unified OTA format)
+SET "OTA_FILENAME=mt-!MCU!-ota.bin"
 CALL :LOG_MESSAGE DEBUG "Set OTA_FILENAME to: !OTA_FILENAME!"

@REM Set SPIFFS filename with "littlefs-" prefix.
--- a/bin/device-install.sh
+++ b/bin/device-install.sh
@@ -131,14 +131,8 @@ if [[ -f "$FILENAME" && "$FILENAME" == *.factory.bin ]]; then
        exit 1
    fi

-    # Determine OTA filename based on MCU type
-    if [ "$MCU" == "esp32s3" ]; then
-        OTAFILE=bleota-s3.bin
-    elif [ "$MCU" == "esp32c3" ]; then
-        OTAFILE=bleota-c3.bin
-    else
-        OTAFILE=bleota.bin
-    fi
+    # Determine OTA filename based on MCU type (unified OTA format)
+    OTAFILE="mt-${MCU}-ota.bin"

    # Set SPIFFS filename with "littlefs-" prefix.
    SPIFFSFILE="littlefs-${PROGNAME/firmware-/}.bin"
--- a/variants/nrf52840/heltec_mesh_solar/platformio.ini
+++ b/variants/nrf52840/heltec_mesh_solar/platformio.ini
@@ -16,7 +16,7 @@ lib_deps =
  # renovate: datasource=git-refs depName=NMIoT-meshsolar packageName=https://github.com/NMIoT/meshsolar gitBranch=main
  https://github.com/NMIoT/meshsolar/archive/dfc5330dad443982e6cdd37a61d33fc7252f468b.zip
  # renovate: datasource=custom.pio depName=ArduinoJson packageName=bblanchon/library/ArduinoJson
-  bblanchon/ArduinoJson@6.21.5
+  bblanchon/ArduinoJson@7.4.2

 [env:heltec-mesh-solar]
 custom_meshtastic_hw_model = 108
--- a/variants/nrf52840/rak4631_eth_gw/platformio.ini
+++ b/variants/nrf52840/rak4631_eth_gw/platformio.ini
@@ -36,7 +36,7 @@ lib_deps =
  # renovate: datasource=git-refs depName=RAK12034-BMX160 packageName=https://github.com/RAKWireless/RAK12034-BMX160 gitBranch=main
  https://github.com/RAKWireless/RAK12034-BMX160/archive/dcead07ffa267d3c906e9ca4a1330ab989e957e2.zip
  # renovate: datasource=custom.pio depName=ArduinoJson packageName=bblanchon/library/ArduinoJson
-  bblanchon/ArduinoJson@6.21.5
+  bblanchon/ArduinoJson@7.4.2
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 ; Note: as of 6/2013 the serial/bootloader based programming takes approximately 30 seconds
 ;upload_protocol = jlink
Author	SHA1	Message	Date
renovate[bot]	593fa1d436	Update ArduinoJson to v7	2026-01-30 19:56:43 +00:00
Ben Meadors	e9d4485bb5	Merge remote-tracking branch 'origin/develop'	2026-01-30 13:56:11 -06:00
Ben Meadors	004179c045	Fix OTA filename determination to use unified format for ESP32 (#9488 )	2026-01-30 13:46:11 -06:00