fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-17 01:13:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

NuttX upgrade cmake wrapper (#7873)

Browse Source 
* NuttX cmake

* px4_macros:Pass the stringified predicate as second arg to static assert

   CC_ASSERT mapes to the c++ static_assert or provides the same
   funtionality for c via the other macros. The c++ static assert
   takes 2 argumants the prdicate and a message. This fixes the
   lacking second argument.

* Updated nuttx and apps submodule to upstream nuttx 7.21+==master

   This is the latest uptake of upstream nuttx and apps.

* ROMFS generate with xxd instead of objcopy

* delete nuttx-patches

* NuttX update submodules to latest px4_nuttx-master

* fix nuttx apps and board dependency

* docker_run update to latest container 2017-08-29

* cmake ROMFS portable sed usage

* NuttX update submodules to latest px4_nuttx-master
This commit is contained in:
Daniel Agar
2017-09-29 10:13:51 -04:00
parent 11e518f494
commit 01b3e6fd25
159 changed files with 3220 additions and 4256 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/uavcannode/CMakeLists.txt
+11 -12
View File
@@ -46,21 +46,18 @@ add_definitions(
-DUAVCAN_STM32_TIMER_NUMBER=2
-DUAVCAN_USE_CPP03=ON
-DUAVCAN_USE_EXTERNAL_SNPRINT
-DAPP_VERSION_MAJOR=${uavcanblid_sw_version_major}
-DAPP_VERSION_MINOR=${uavcanblid_sw_version_minor}
-DHW_UAVCAN_NAME=${uavcanblid_name}
-DHW_VERSION_MAJOR=${uavcanblid_hw_version_major}
-DHW_VERSION_MINOR=${uavcanblid_hw_version_minor}
)
add_subdirectory(../uavcan/libuavcan uavcannode_libuavcan)
set(LIBUAVCAN_DIR ${PX4_SOURCE_DIR}/src/modules/uavcan/libuavcan)
add_subdirectory(${LIBUAVCAN_DIR} uavcannode_libuavcan)
add_dependencies(uavcan platforms__nuttx)
include_directories(../../drivers/bootloaders/include)
include_directories(../uavcan/libuavcan/libuavcan/include)
include_directories(../uavcan/libuavcan/libuavcan/include/dsdlc_generated)
include_directories(../uavcan/libuavcan/libuavcan_drivers/posix/include)
include_directories(../uavcan/libuavcan/libuavcan_drivers/stm32/driver/include)
include_directories(${PX4_SOURCE_DIR}/src/drivers/bootloaders/include)
include_directories(${LIBUAVCAN_DIR}/libuavcan/include)
include_directories(${LIBUAVCAN_DIR}/libuavcan/include/dsdlc_generated)
include_directories(${LIBUAVCAN_DIR}/libuavcan_drivers/posix/include)
include_directories(${LIBUAVCAN_DIR}/libuavcan_drivers/stm32/driver/include)
px4_add_module(
MODULE modules__uavcannode
@@ -83,4 +80,6 @@ px4_add_module(
uavcan
)
target_link_libraries(modules__uavcannode uavcan uavcan_stm32_driver)
target_link_libraries(modules__uavcannode PUBLIC uavcan uavcan_stm32_driver)
set_property(GLOBAL APPEND PROPERTY PX4_LIBRARIES uavcan_stm32_driver)