Merge pull request #1141 from bitcraze/krichardsson/kbuild-clean

Krichardsson/kbuild-clean
bitcraze · Nov 7, 2022 · 68a7ec9 · 68a7ec9
2 parents 0fa9a99 + aa0e75e
commit 68a7ec9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/src/deck/drivers/src/Kconfig b/src/deck/drivers/src/Kconfig
@@ -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
@@ -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"
@@ -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"
@@ -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"
@@ -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
@@ -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

diff --git a/src/modules/src/Kbuild b/src/modules/src/Kbuild
@@ -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

diff --git a/src/utils/src/Kbuild b/src/utils/src/Kbuild
@@ -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