Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kbuild cleanup for TDoA #1141

Merged
merged 2 commits into from
Nov 7, 2022
Merged

Kbuild cleanup for TDoA #1141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b40c0c
Fix dependencies to loco
krichardsson Nov 3, 2022
aa0e75e
Only compile tdoa files when loco deck is enabled
krichardsson Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/deck/drivers/src/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ config DECK_ACTIVE_MARKER
can set up to 4 different IDs giving you the possibility to uniqly
identify a large number of rigid bodies, without the need of many
reflective markers.

config DECK_AI
bool "Support the AI deck"
select ENABLE_CPX
Expand Down Expand Up @@ -38,7 +38,7 @@ choice
endchoice

menu "Credentials for access-point"
depends on DECK_AI
depends on DECK_AI
depends on !DECK_AI_WIFI_NO_SETUP
config DECK_AI_SSID
string "WiFi SSID"
Expand All @@ -51,7 +51,7 @@ menu "Credentials for access-point"
default "mypassword"
help
WiFi password (Minimum length of 8)
endmenu
endmenu

config DECK_BIGQUAD
bool "Support the BigQuad deck"
Expand Down Expand Up @@ -125,7 +125,7 @@ config DECK_CPPM_USE_PA3
config DECK_CPPM_USE_PA7
bool "PA7/MOSI"

endchoice
endchoice

config DECK_EXTRX_ALT_HOLD
bool "Enable altitude hold via ExtRx"
Expand Down Expand Up @@ -258,7 +258,7 @@ config DECK_LIGHTHOUSE_AS_GROUNDTRUTH
help
Use the lighthouse system as a groundtruth. This will also switch the
estimation method to the crossing beam position estimate and not send the
position to the kalman estimator and you can
position to the kalman estimator and you can
read out the positioning from the loggin lighthouse.x.y.z

config DECK_LIGHTHOUSE_MAX_N_BS
Expand Down Expand Up @@ -318,11 +318,12 @@ endchoice

config DECK_LOCO_FULL_TX_POWER
bool "Full TX power"
depends on DECK_LOCO
default n

config DECK_LOCO_LONGER_RANGE
bool "Longer range mode"
depends on DECK_LOCO_ALGORITHM_TDOA3
depends on DECK_LOCO && DECK_LOCO_ALGORITHM_TDOA3
default n
help
Note that anchors need to be built with support for this as well
Expand Down
2 changes: 1 addition & 1 deletion src/modules/src/Kbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ obj-y += static_mem.o
obj-y += supervisor.o
obj-y += sysload.o
obj-y += system.o
obj-y += tdoaEngineInstance.o
obj-$(CONFIG_DECK_LOCO) += tdoaEngineInstance.o
obj-y += vcp_esc_passthrough.o
obj-y += worker.o
obj-$(CONFIG_ENABLE_CPX) += cpx/cpx_external_router.o
Expand Down
6 changes: 3 additions & 3 deletions src/utils/src/Kbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ obj-y += sleepus.o
obj-y += statsCnt.o

# TDoA
obj-y += tdoa/tdoaEngine.o
obj-y += tdoa/tdoaStats.o
obj-y += tdoa/tdoaStorage.o
obj-$(CONFIG_DECK_LOCO) += tdoa/tdoaEngine.o
obj-$(CONFIG_DECK_LOCO) += tdoa/tdoaStats.o
obj-$(CONFIG_DECK_LOCO) += tdoa/tdoaStorage.o