Merge pull request #2973 from jgoppert/cmake-fmuv1-fix

Removed uavcan from nuttx firmware for v1.
2026-04-14 10:07:39 +08:00 · 2015-10-12 08:30:24 +02:00 · 2015-10-12 08:30:24 +02:00 · c8cb13e904
commit c8cb13e904
parent 67087c6428 4ad82644fe
3 changed files with 2 additions and 3 deletions
--- a/cmake/configs/nuttx_px4fmu-v1_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v1_default.cmake
@ -98,7 +98,6 @@ set(config_module_list
 	modules/controllib
 	modules/uORB
 	modules/dataman
-	modules/uavcan

 	#
 	# Libraries
--- a/cmake/configs/nuttx_px4fmu-v2_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v2_default.cmake
@ -168,6 +168,8 @@ set(config_io_board

 set(config_extra_libs
 	${CMAKE_SOURCE_DIR}/src/lib/mathlib/CMSIS/libarm_cortexM4lf_math.a
+	libuavcan.a
+	libuavcan_stm32_driver.a
 	)

 set(config_io_extra_libs
--- a/src/firmware/nuttx/CMakeLists.txt
+++ b/src/firmware/nuttx/CMakeLists.txt
@ -40,8 +40,6 @@ target_link_libraries(firmware_nuttx
 	${module_libraries}
 	${config_extra_libs}
 	${link_libs}
-	libuavcan_stm32_driver.a
-	libuavcan.a
 	-Wl,--end-group)

 add_custom_target(check_weak