Merge pull request #3637 from marcelverdult/upstream-candidate/meshtracker-x1-micronmea-dep
Fix MeshTracker X1 kiss_modem build: inherit MicroNMEA in every environment
This commit is contained in:
commit
9ea4b83ed1
1 file changed
+1
-4
@@ -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
|
||||
|
||||
|
||||
Reference in new issue
Block a user