Repository navigation
Fix MeshTracker X1 kiss_modem build: inherit MicroNMEA in every environment - #3637
Open
marcelverdult wants to merge 1 commit into
Open
marcelverdult wants to merge 1 commit into
marcelverdult wants to merge 1 commit into
Conversation
…riant
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 428a95c 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.
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
MeshTracker_X1_kiss_modemdoes not build:It is the one environment of this variant that does not list
stevemarple/MicroNMEA;the other four do.
variants/meshtracker_x1/target.cppincludes the location providerunconditionally and every environment of the variant compiles
target.cpp, so all fiveneed the library.
This moves the dependency into the
[MeshTracker_X1]base section, which is howvariants/nano_g2_ultraalready keeps it, and removes the four per-environment copies.Verification, built locally with PlatformIO 6.2.0 (the pull request build check installs
the latest PlatformIO, so the versions are not identical):
MeshTracker_X1_kiss_modempreviously didnot build at all.
.textand.bssare byte for byte identical to abuild from the same commit without this change:
MeshTracker_X1_repeater299524 /32024,
_room_server292020 / 35740,_companion_radio_usb316356 / 141000,_companion_radio_ble322036 / 145432.Worth noting for the matrix:
.github/workflows/pr-build-check.ymldoes not build anyenvironment of this variant, so a green check on a pull request does not cover this
environment. That is presumably why it could regress unnoticed.