fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't add DriverFramework dir for NuttX

Browse Source 
I am unable to get the nuttx build dependencies set up so that
it builds the export dir before it builds df_driver_framework.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois 2015-11-18 20:14:48 -08:00
parent af155b8e59
commit 52957ab0cc
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -335,10 +335,9 @@ foreach(module ${config_module_list})
endforeach()
add_subdirectory(src/firmware/${OS})
add_subdirectory(src/lib/DriverFramework)
if("${OS}" STREQUAL "nuttx")
add_dependencies(df_driver_framework nuttx_export_${BOARD})
if (NOT "${OS}" STREQUAL "nuttx")
add_subdirectory(src/lib/DriverFramework)
endif()
if (config_io_board)

5
cmake/nuttx/px4_impl_nuttx.cmake
View File

@ -423,6 +423,7 @@ function(px4_os_add_flags)
${nuttx_export_dir}/include/cxx
${nuttx_export_dir}/arch/chip
${nuttx_export_dir}/arch/common
src/lib/DriverFramework/framework/include
)
set(added_link_dirs
${nuttx_export_dir}/libs
@ -440,7 +441,7 @@ function(px4_os_add_flags)
-nostdlib
)
set(added_exe_linker_flags) # none currently
set(added_exe_linker_flags -lstdc++) # none currently
set(cpu_flags)
if (${BOARD} STREQUAL "px4fmu-v1")
@ -490,6 +491,8 @@ function(px4_os_add_flags)
#message(STATUS "nuttx: set(${${var}} ${${${var}}} ${added_${lower_var}} PARENT_SCOPE)")
endforeach()
set(DF_TARGET "nuttx" PARENT_SCOPE)
endfunction()
#=============================================================================

2
cmake/qurt/px4_impl_qurt.cmake
View File

@ -187,7 +187,7 @@ function(px4_os_add_flags)
set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")
set(DF_TARGET "qurt")
set(DF_TARGET "qurt" PARENT_SCOPE)
# output
foreach(var ${inout_vars})

2
src/firmware/nuttx/CMakeLists.txt
View File

@ -13,7 +13,7 @@ add_executable(firmware_nuttx
set(nuttx_export_dir ${CMAKE_BINARY_DIR}/${BOARD}/NuttX/nuttx-export)
set(link_libs
romfs apps nuttx m gcc
romfs apps nuttx m gcc df_driver_framework
)
if(NOT ${BOARD} STREQUAL "sim")

2
src/lib/DriverFramework

@ -1 +1 @@
Subproject commit 737d2cbf2c94210b964cf00d55903f1b9c52b2f6
Subproject commit a759ad3142b3b30d4e3a3157ec684966f7dcc83c

6
src/modules/commander/PreflightCheck.cpp
View File

@ -197,7 +197,7 @@ static bool accelerometerCheck(int mavlink_fd, unsigned instance, bool optional,
if (dynamic) {
/* check measurement result range */
struct accel_report acc;
ret = px4_read(fd, &acc, sizeof(acc));
ret = h.read(&acc, sizeof(acc));
if (ret == sizeof(acc)) {
/* evaluate values */
@ -219,9 +219,7 @@ static bool accelerometerCheck(int mavlink_fd, unsigned instance, bool optional,
#endif
out:
#ifdef __PX4_NUTTX
px4_close(fd);
#endif
DevMgr::releaseHandle(h);
return success;
}