From 2f28a7b3b1ecde18e276f8fcda52b8085898da2e Mon Sep 17 00:00:00 2001 From: Jakub <106778416+MarekZegare4@users.noreply.github.com> Date: Sun, 10 May 2026 22:53:36 +0200 Subject: [PATCH] Fix FIRMWARE_VERSION: append -Plus in build.sh, not platformio.ini MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit build.sh sets FIRMWARE_VERSION via PLATFORMIO_BUILD_FLAGS — hardcoding it in platformio.ini caused a macro redefinition conflict. Instead, build_wio_tracker_l1_firmwares() now appends "-Plus" to the env var before calling build_firmware(), so the final version string becomes e.g. v1.15.0-Plus-abcdef. Co-Authored-By: Claude Sonnet 4.6 --- build.sh | 3 +++ variants/wio-tracker-l1/platformio.ini | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 6e2e8cfb..8fc513d2 100755 --- a/build.sh +++ b/build.sh @@ -231,8 +231,11 @@ build_companion_firmwares() { } build_wio_tracker_l1_firmwares() { + local _saved_version="$FIRMWARE_VERSION" + export FIRMWARE_VERSION="${FIRMWARE_VERSION}-Plus" build_firmware "WioTrackerL1_companion_radio_usb_settings" build_firmware "WioTrackerL1_companion_radio_ble_settings" + export FIRMWARE_VERSION="$_saved_version" } build_room_server_firmwares() { diff --git a/variants/wio-tracker-l1/platformio.ini b/variants/wio-tracker-l1/platformio.ini index 26ed87b5..115d686f 100644 --- a/variants/wio-tracker-l1/platformio.ini +++ b/variants/wio-tracker-l1/platformio.ini @@ -68,7 +68,6 @@ build_flags = ${WioTrackerL1.build_flags} -D OFFLINE_QUEUE_SIZE=256 -D PIN_BUZZER=12 -D QSPIFLASH=1 - -D FIRMWARE_VERSION='"v1.15.0-Plus"' ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${WioTrackerL1.build_src_filter} @@ -107,7 +106,6 @@ build_flags = ${WioTrackerL1.build_flags} -D PIN_BUZZER=12 -D QSPIFLASH=1 -D ADVERT_NAME='"@@MAC"' - -D FIRMWARE_VERSION='"v1.15.0-Plus"' -D ENV_PIN_SDA=PIN_WIRE1_SDA -D ENV_PIN_SCL=PIN_WIRE1_SCL ; -D MESH_PACKET_LOGGING=1