From 665ece4c3cd2ad52d6592764b1f37c6d0abaa316 Mon Sep 17 00:00:00 2001 From: Marcel Verdult Date: Mon, 19 Oct 2026 23:19:42 +0200 Subject: [PATCH] fix(meshtracker_x1): inherit MicroNMEA in every environment of the variant What changes - variants/meshtracker_x1/platformio.ini moves stevemarple/MicroNMEA from the four environments that listed it into the [MeshTracker_X1] base section, the way nano_g2_ultra already keeps it, and drops the four copies. Why - MeshTracker_X1_kiss_modem was the one environment of this variant that did not list the library, so it did not build: src/helpers/sensors/MicroNMEALocationProvider.h:4: fatal error: MicroNMEA.h: No such file or directory variants/meshtracker_x1/target.cpp includes the location provider unconditionally and every environment of this variant compiles target.cpp, so every one of them needs the library. Putting it in the base section makes that true by construction rather than by repeating the line and hoping none is forgotten, which is exactly what happened here. Compatibility - All five environments of the variant were built, which is the whole reach of this change. MeshTracker_X1_kiss_modem now builds (text 240180, bss 18236; on unchanged dev it does not build at all). For the four that already built, text and bss are byte for byte identical to a build from unchanged dev 428a95c6 with the same toolchain, so inheriting the library instead of listing it changes nothing for them: MeshTracker_X1_repeater text 299524 bss 32024, _room_server 292020 / 35740, _companion_radio_usb 316356 / 141000, _companion_radio_ble 322036 / 145432, each text +0 and bss +0 against dev. --- variants/meshtracker_x1/platformio.ini | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/variants/meshtracker_x1/platformio.ini b/variants/meshtracker_x1/platformio.ini index 2194d48d9..80286460b 100644 --- a/variants/meshtracker_x1/platformio.ini +++ b/variants/meshtracker_x1/platformio.ini @@ -34,6 +34,7 @@ build_src_filter = ${nrf52_base.build_src_filter} +<../variants/meshtracker_x1> lib_deps = ${nrf52_base.lib_deps} https://github.com/adafruit/Adafruit_SPA06_003/archive/refs/tags/1.0.2.zip + stevemarple/MicroNMEA @ ^2.0.6 debug_tool = jlink upload_protocol = nrfutil @@ -51,7 +52,6 @@ build_flags = ${MeshTracker_X1.build_flags} build_src_filter = ${MeshTracker_X1.build_src_filter} +<../examples/simple_repeater> lib_deps = ${MeshTracker_X1.lib_deps} - stevemarple/MicroNMEA @ ^2.0.6 [env:MeshTracker_X1_room_server] extends = MeshTracker_X1 @@ -67,7 +67,6 @@ build_flags = ${MeshTracker_X1.build_flags} build_src_filter = ${MeshTracker_X1.build_src_filter} +<../examples/simple_room_server> lib_deps = ${MeshTracker_X1.lib_deps} - stevemarple/MicroNMEA @ ^2.0.6 [env:MeshTracker_X1_companion_radio_usb] extends = MeshTracker_X1 @@ -94,7 +93,6 @@ build_src_filter = ${MeshTracker_X1.build_src_filter} +<../examples/companion_radio/ui-orig/*.cpp> lib_deps = ${MeshTracker_X1.lib_deps} densaugeo/base64 @ ~1.4.0 - stevemarple/MicroNMEA @ ^2.0.6 end2endzone/NonBlockingRTTTL@^1.3.0 adafruit/Adafruit DRV2605 Library @ ^1.2.4 @@ -127,7 +125,6 @@ build_src_filter = ${MeshTracker_X1.build_src_filter} +<../examples/companion_radio/ui-orig/*.cpp> lib_deps = ${MeshTracker_X1.lib_deps} densaugeo/base64 @ ~1.4.0 - stevemarple/MicroNMEA @ ^2.0.6 end2endzone/NonBlockingRTTTL@^1.3.0 adafruit/Adafruit DRV2605 Library @ ^1.2.4