From eb18edf5eb3c47d736a565d552b438bf3b715825 Mon Sep 17 00:00:00 2001 From: Eric Katzfey <53063038+katzfey@users.noreply.github.com> Date: Thu, 13 Feb 2025 21:49:09 -0800 Subject: [PATCH] Don't allow spacecraft module parameters for VOXL 2 builds (#24336) - VOXL 2 builds use DISABLE_PARAMS_MODULE_SCOPING for parameters. The new spacecraft module has duplicate symbols with the control_allocator module and so this kills the VOXL 2 build --- src/lib/parameters/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/lib/parameters/CMakeLists.txt b/src/lib/parameters/CMakeLists.txt index b87e652cad..81b609080a 100644 --- a/src/lib/parameters/CMakeLists.txt +++ b/src/lib/parameters/CMakeLists.txt @@ -62,6 +62,10 @@ if(DISABLE_PARAMS_MODULE_SCOPING) # allow those timer configurations to be skipped. if ((${PX4_BOARD_NAME} MATCHES "MODALAI_VOXL2") AND (file_path MATCHES pwm_out)) message(STATUS "Skipping pwm file path ${file_path} for VOXL2") + # Spacecraft has duplicate parameter names which kills the VOXL 2 build. VOXL 2 does not + # support the spacecraft module so we skip adding the parameters. + elseif ((${PX4_BOARD_NAME} MATCHES "MODALAI_VOXL2") AND (file_path MATCHES spacecraft)) + message(STATUS "Skipping spacecraft file path ${file_path} for VOXL2") else() list(APPEND module_config_files "${file_path}") endif()