Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-07-26 23:08:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix FIRMWARE_VERSION: append -Plus in build.sh, not platformio.ini

Browse Source 
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 <noreply@anthropic.com>
This commit is contained in:
Jakub
2026-05-10 22:53:36 +02:00
parent 87aafce88f
commit 3f7293c657
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build.sh
View File

@@ -231,8 +231,11 @@ build_companion_firmwares() {
} }
build_wio_tracker_l1_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_usb_settings"
build_firmware "WioTrackerL1_companion_radio_ble_settings" build_firmware "WioTrackerL1_companion_radio_ble_settings"
export FIRMWARE_VERSION="$_saved_version"
} }
build_room_server_firmwares() { build_room_server_firmwares() {

2
variants/wio-tracker-l1/platformio.ini
View File

@@ -68,7 +68,6 @@ build_flags = ${WioTrackerL1.build_flags}
-D OFFLINE_QUEUE_SIZE=256 -D OFFLINE_QUEUE_SIZE=256
-D PIN_BUZZER=12 -D PIN_BUZZER=12
-D QSPIFLASH=1 -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_PACKET_LOGGING=1
; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1
build_src_filter = ${WioTrackerL1.build_src_filter} build_src_filter = ${WioTrackerL1.build_src_filter}
@@ -107,7 +106,6 @@ build_flags = ${WioTrackerL1.build_flags}
-D PIN_BUZZER=12 -D PIN_BUZZER=12
-D QSPIFLASH=1 -D QSPIFLASH=1
-D ADVERT_NAME='"@@MAC"' -D ADVERT_NAME='"@@MAC"'
-D FIRMWARE_VERSION='"v1.15.0-Plus"'
-D ENV_PIN_SDA=PIN_WIRE1_SDA -D ENV_PIN_SDA=PIN_WIRE1_SDA
-D ENV_PIN_SCL=PIN_WIRE1_SCL -D ENV_PIN_SCL=PIN_WIRE1_SCL
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1