Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-01 02:55:07 +08:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Use DriverFramework as a PX4 module (#4415)

Browse Source 
* Use DriverFramework as a PX4 module

Targets wanting to use DriverFramework must add

   lib/DriverFramework/framework

to their config file.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>

* Removed spurious code

No need to add if check before for loop

Signed-off-by: Mark Charlebois <charlebm@gmail.com>

* Added DriverFramework to NuttX configs

Added lib/DriverFramework/firmware to nuttx configs

Signed-off-by: Mark Charlebois <charlebm@gmail.com>

* Updated src/lib/DriverFramework

* Removed DF_TARGET and __DF_${OS} defines

These are now handled inside DriverFramework

Signed-off-by: Mark Charlebois <charlebm@gmail.com>

* Updated DriverFramework

Signed-off-by: Mark Charlebois <charlebm@gmail.com>

* Restored __DF_${OS}

The include files in DriverFramwork need to know the target OS.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois
2016-05-03 01:03:28 -07:00
committed by Lorenz Meier
parent 23a9af9088
commit 8cb8987bcd
33 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/configs/nuttx_mindpx-v2_default.cmake
+1
View File
@@ -130,6 +130,7 @@ set(config_module_list
lib/terrain_estimation
lib/runway_takeoff
lib/tailsitter_recovery
lib/DriverFramework/framework
platforms/nuttx
# had to add for cmake, not sure why wasn't in original config
cmake/configs/nuttx_px4-stm32f4discovery_default.cmake
+1
View File
@@ -43,6 +43,7 @@ set(config_module_list
lib/external_lgpl
lib/geo
lib/conversion
lib/DriverFramework/framework
platforms/nuttx
# had to add for cmake, not sure why wasn't in original config
cmake/configs/nuttx_px4fmu-v1_default.cmake
+1
View File
@@ -115,6 +115,7 @@ set(config_module_list
lib/terrain_estimation
lib/runway_takeoff
lib/tailsitter_recovery
lib/DriverFramework/framework
platforms/nuttx
# had to add for cmake, not sure why wasn't in original config
cmake/configs/nuttx_px4fmu-v2_default.cmake
+1
View File
@@ -124,6 +124,7 @@ set(config_module_list
lib/terrain_estimation
lib/runway_takeoff
lib/tailsitter_recovery
lib/DriverFramework/framework
platforms/nuttx
# had to add for cmake, not sure why wasn't in original config
cmake/configs/nuttx_px4fmu-v2_ekf2.cmake
+1
View File
@@ -123,6 +123,7 @@ set(config_module_list
lib/terrain_estimation
lib/runway_takeoff
lib/tailsitter_recovery
lib/DriverFramework/framework
platforms/nuttx
# had to add for cmake, not sure why wasn't in original config
cmake/configs/nuttx_px4fmu-v4_default.cmake
+1
View File
@@ -125,6 +125,7 @@ set(config_module_list
lib/terrain_estimation
lib/runway_takeoff
lib/tailsitter_recovery
lib/DriverFramework/framework
platforms/nuttx
# had to add for cmake, not sure why wasn't in original config
cmake/configs/posix_eagle_default.cmake
+1
View File
@@ -55,6 +55,7 @@ set(config_module_list
lib/terrain_estimation
lib/runway_takeoff
lib/tailsitter_recovery
lib/DriverFramework/framework
platforms/common
platforms/posix/px4_layer
cmake/configs/posix_eagle_hil.cmake
+1
View File
@@ -33,6 +33,7 @@ set(config_module_list
lib/geo
lib/geo_lookup
lib/conversion
lib/DriverFramework/framework
platforms/common
platforms/posix/px4_layer
cmake/configs/posix_eagle_legacy_driver_default.cmake
+1
View File
@@ -56,6 +56,7 @@ set(config_module_list
lib/terrain_estimation
lib/runway_takeoff
lib/tailsitter_recovery
lib/DriverFramework/framework
platforms/common
platforms/posix/px4_layer
cmake/configs/posix_eagle_legacy_driver_release.cmake
+1
View File
@@ -35,6 +35,7 @@ set(config_module_list
lib/geo
lib/geo_lookup
lib/conversion
lib/DriverFramework/framework
platforms/common
platforms/posix/px4_layer
cmake/configs/posix_eagle_muorb.cmake
+2
View File
@@ -9,6 +9,8 @@ set(config_module_list
modules/uORB
lib/DriverFramework/framework
platforms/posix/px4_layer
platforms/posix/work_queue
cmake/configs/posix_eagle_release.cmake
+1
View File
@@ -29,6 +29,7 @@ set(config_module_list
lib/geo
lib/geo_lookup
lib/conversion
lib/DriverFramework/framework
platforms/common
platforms/posix/px4_layer
cmake/configs/posix_rpi2_default.cmake
+1
View File
@@ -44,4 +44,5 @@ set(config_module_list
lib/terrain_estimation
lib/runway_takeoff
lib/tailsitter_recovery
lib/DriverFramework/framework
)
cmake/configs/posix_rpi2_release.cmake
+1
View File
@@ -53,4 +53,5 @@ set(config_module_list
lib/terrain_estimation
lib/runway_takeoff
lib/tailsitter_recovery
lib/DriverFramework/framework
)
cmake/configs/posix_sitl_broadcast.cmake
+1
View File
@@ -62,6 +62,7 @@ set(config_module_list
lib/terrain_estimation
lib/runway_takeoff
lib/tailsitter_recovery
lib/DriverFramework/framework
examples/px4_simple_app
)
cmake/configs/posix_sitl_default.cmake
+1
View File
@@ -62,6 +62,7 @@ set(config_module_list
lib/terrain_estimation
lib/runway_takeoff
lib/tailsitter_recovery
lib/DriverFramework/framework
examples/px4_simple_app
)
cmake/configs/posix_sitl_ekf2.cmake
+1
View File
@@ -61,6 +61,7 @@ set(config_module_list
lib/terrain_estimation
lib/runway_takeoff
lib/tailsitter_recovery
lib/DriverFramework/framework
examples/px4_simple_app
)
cmake/configs/posix_sitl_replay.cmake
+1
View File
@@ -25,6 +25,7 @@ set(config_module_list
lib/external_lgpl
lib/geo
lib/geo_lookup
lib/DriverFramework/framework
)
set(config_extra_builtin_cmds
cmake/configs/qurt_eagle_default.cmake
+1
View File
@@ -74,6 +74,7 @@ set(config_module_list
lib/terrain_estimation
lib/runway_takeoff
lib/tailsitter_recovery
lib/DriverFramework/framework
#
# QuRT port
cmake/configs/qurt_eagle_hil.cmake
+1
View File
@@ -59,6 +59,7 @@ set(config_module_list
lib/runway_takeoff
lib/tailsitter_recovery
lib/controllib
lib/DriverFramework/framework
#
# QuRT port
cmake/configs/qurt_eagle_legacy_driver_default.cmake
+1
View File
@@ -77,6 +77,7 @@ set(config_module_list
lib/terrain_estimation
lib/runway_takeoff
lib/tailsitter_recovery
lib/DriverFramework/framework
#
# QuRT port
cmake/configs/qurt_eagle_legacy_driver_release.cmake
+1
View File
@@ -87,6 +87,7 @@ set(config_module_list
lib/terrain_estimation
lib/runway_takeoff
lib/tailsitter_recovery
lib/DriverFramework/framework
#
# QuRT port
cmake/configs/qurt_eagle_muorb.cmake
+1
View File
@@ -33,6 +33,7 @@ set(config_module_list
lib/geo
lib/geo_lookup
lib/conversion
lib/DriverFramework/framework
#
# QuRT port
cmake/configs/qurt_eagle_release.cmake
+1
View File
@@ -83,6 +83,7 @@ set(config_module_list
lib/terrain_estimation
lib/runway_takeoff
lib/tailsitter_recovery
lib/DriverFramework/framework
#
# QuRT port
cmake/configs/qurt_eagle_test.cmake
+1
View File
@@ -31,6 +31,7 @@ set(config_module_list
lib/mathlib
lib/mathlib/math/filter
lib/conversion
lib/DriverFramework/framework
#
# QuRT port
cmake/configs/qurt_eagle_travis.cmake
+1
View File
@@ -67,6 +67,7 @@ set(config_module_list
lib/terrain_estimation
lib/runway_takeoff
lib/tailsitter_recovery
lib/DriverFramework/framework
#
# QuRT port
cmake/nuttx/px4_impl_nuttx.cmake
-2
View File
@@ -500,8 +500,6 @@ function(px4_os_add_flags)
#message(STATUS "nuttx: set(${${var}} ${${${var}}} ${added_${lower_var}} PARENT_SCOPE)")
endforeach()
set(DF_TARGET "nuttx" PARENT_SCOPE)
endfunction()
#=============================================================================
cmake/qurt/px4_impl_qurt.cmake
-2
View File
@@ -177,8 +177,6 @@ function(px4_os_add_flags)
set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")
set(DF_TARGET "qurt" PARENT_SCOPE)
# output
foreach(var ${inout_vars})
string(TOLOWER ${var} lower_var)