Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-31 18:47:21 +08:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Merge pull request #3297 from PX4/master_uavcan_num_if

Browse Source 
Set number of UAVCAN interfaces on HW from top level cmake file
This commit is contained in:
Lorenz Meier
2015-12-01 06:15:47 +01:00
parent 1fc774bbf8 3ce6ee57e4
commit 93bb1ab80f
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/configs/nuttx_px4fmu-v2_default.cmake
+2
View File
@@ -2,6 +2,8 @@ include(nuttx/px4_impl_nuttx)
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-none-eabi.cmake) set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-none-eabi.cmake)
set(config_uavcan_num_ifaces 2)
set(config_module_list set(config_module_list
# #
# Board support modules # Board support modules
cmake/configs/nuttx_px4fmu-v4_default.cmake
+2
View File
@@ -2,6 +2,8 @@ include(nuttx/px4_impl_nuttx)
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-none-eabi.cmake) set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-none-eabi.cmake)
set(config_uavcan_num_ifaces 1)
set(config_module_list set(config_module_list
# #
# Board support modules # Board support modules
src/modules/uavcan/CMakeLists.txt
+1 -1
View File
@@ -41,7 +41,7 @@ add_definitions(
-DUAVCAN_NO_ASSERTIONS -DUAVCAN_NO_ASSERTIONS
-DUAVCAN_PLATFORM=stm32 -DUAVCAN_PLATFORM=stm32
-DUAVCAN_STM32_${OS_UPPER}=1 -DUAVCAN_STM32_${OS_UPPER}=1
-DUAVCAN_STM32_NUM_IFACES=2 -DUAVCAN_STM32_NUM_IFACES=${config_uavcan_num_ifaces}
-DUAVCAN_STM32_TIMER_NUMBER=5 -DUAVCAN_STM32_TIMER_NUMBER=5
) )