Use DriverFramework as a PX4 module (#4415)

* 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>

Use DriverFramework as a PX4 module (#4415)
8cb8987b · Mark Charlebois · Lorenz Meier · 23a9af90 · 8cb8987b · 8cb8987b
Commit 8cb8987b authored 8 years ago by Mark Charlebois Committed by Lorenz Meier 8 years ago
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -150,16 +150,6 @@ list(GET config_args 1 BOARD)
 list(GET config_args 2 LABEL)
 set(target_name "${OS}-${BOARD}-${LABEL}")

-if("${OS}" STREQUAL "posix")
-	if (APPLE)
-		set(DF_TARGET darwin)
-	else()
-		set(DF_TARGET linux)
-	endif()
-else()
-	set(DF_TARGET ${OS})
-endif()
-
 message(STATUS "${target_name}")

 # switch to ros CMake file if building ros
@@ -333,12 +323,11 @@ execute_process(COMMAND cmake -E make_directory ${ep_base}/Install/include)
 #=============================================================================
 # DriverFramework Drivers
 #
-#message("ADDING DRIVERS")
 set(df_driver_libs)
 foreach(driver ${config_df_driver_list})
 	add_subdirectory(src/lib/DriverFramework/drivers/${driver})
 	list(APPEND df_driver_libs df_${driver})
-	message("adding driver: ${driver}")
+	message("Adding DF driver: ${driver}")
 endforeach()

 #=============================================================================
@@ -361,8 +350,6 @@ endforeach()

 add_subdirectory(src/firmware/${OS})

-add_subdirectory(src/lib/DriverFramework/framework/src)
-
 #add_dependencies(df_driver_framework nuttx_export_${CONFIG}.stamp)
 if (NOT "${OS}" STREQUAL "nuttx")
 endif()

--- a/cmake/configs/nuttx_mindpx-v2_default.cmake
+++ b/cmake/configs/nuttx_mindpx-v2_default.cmake
@@ -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

--- a/cmake/configs/nuttx_px4-stm32f4discovery_default.cmake
+++ b/cmake/configs/nuttx_px4-stm32f4discovery_default.cmake
@@ -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

--- a/cmake/configs/nuttx_px4fmu-v1_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v1_default.cmake
@@ -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

--- a/cmake/configs/nuttx_px4fmu-v2_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v2_default.cmake
@@ -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

--- a/cmake/configs/nuttx_px4fmu-v2_ekf2.cmake
+++ b/cmake/configs/nuttx_px4fmu-v2_ekf2.cmake
@@ -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

--- a/cmake/configs/nuttx_px4fmu-v4_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v4_default.cmake
@@ -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

--- a/cmake/configs/posix_eagle_default.cmake
+++ b/cmake/configs/posix_eagle_default.cmake
@@ -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

--- a/cmake/configs/posix_eagle_hil.cmake
+++ b/cmake/configs/posix_eagle_hil.cmake
@@ -33,6 +33,7 @@ set(config_module_list
 	lib/geo
 	lib/geo_lookup
 	lib/conversion
+	lib/DriverFramework/framework

 	platforms/common
 	platforms/posix/px4_layer

--- a/cmake/configs/posix_eagle_legacy_driver_default.cmake
+++ b/cmake/configs/posix_eagle_legacy_driver_default.cmake
@@ -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

--- a/cmake/configs/posix_eagle_legacy_driver_release.cmake
+++ b/cmake/configs/posix_eagle_legacy_driver_release.cmake
@@ -35,6 +35,7 @@ set(config_module_list
 	lib/geo
 	lib/geo_lookup
 	lib/conversion
+	lib/DriverFramework/framework

 	platforms/common
 	platforms/posix/px4_layer

--- a/cmake/configs/posix_eagle_muorb.cmake
+++ b/cmake/configs/posix_eagle_muorb.cmake
@@ -9,6 +9,8 @@ set(config_module_list

 	modules/uORB

+	lib/DriverFramework/framework
+
 	platforms/posix/px4_layer
 	platforms/posix/work_queue


--- a/cmake/configs/posix_eagle_release.cmake
+++ b/cmake/configs/posix_eagle_release.cmake
@@ -29,6 +29,7 @@ set(config_module_list
 	lib/geo
 	lib/geo_lookup
 	lib/conversion
+	lib/DriverFramework/framework

 	platforms/common
 	platforms/posix/px4_layer

--- a/cmake/configs/posix_rpi2_default.cmake
+++ b/cmake/configs/posix_rpi2_default.cmake
@@ -44,4 +44,5 @@ set(config_module_list
 	lib/terrain_estimation
 	lib/runway_takeoff
 	lib/tailsitter_recovery
+	lib/DriverFramework/framework
 )
--- a/cmake/configs/posix_rpi2_release.cmake
+++ b/cmake/configs/posix_rpi2_release.cmake
@@ -53,4 +53,5 @@ set(config_module_list
 	lib/terrain_estimation
 	lib/runway_takeoff
 	lib/tailsitter_recovery
+	lib/DriverFramework/framework
 )
--- a/cmake/configs/posix_sitl_broadcast.cmake
+++ b/cmake/configs/posix_sitl_broadcast.cmake
@@ -62,6 +62,7 @@ set(config_module_list
 	lib/terrain_estimation
 	lib/runway_takeoff
 	lib/tailsitter_recovery
+	lib/DriverFramework/framework
 	examples/px4_simple_app
 	)


--- a/cmake/configs/posix_sitl_default.cmake
+++ b/cmake/configs/posix_sitl_default.cmake
@@ -62,6 +62,7 @@ set(config_module_list
 	lib/terrain_estimation
 	lib/runway_takeoff
 	lib/tailsitter_recovery
+	lib/DriverFramework/framework
 	examples/px4_simple_app
 	)


--- a/cmake/configs/posix_sitl_ekf2.cmake
+++ b/cmake/configs/posix_sitl_ekf2.cmake
@@ -61,6 +61,7 @@ set(config_module_list
 	lib/terrain_estimation
 	lib/runway_takeoff
 	lib/tailsitter_recovery
+	lib/DriverFramework/framework
 	examples/px4_simple_app
 	)


--- a/cmake/configs/posix_sitl_replay.cmake
+++ b/cmake/configs/posix_sitl_replay.cmake
@@ -25,6 +25,7 @@ set(config_module_list
 	lib/external_lgpl
 	lib/geo
 	lib/geo_lookup
+	lib/DriverFramework/framework
 	)

 set(config_extra_builtin_cmds

--- a/cmake/configs/qurt_eagle_default.cmake
+++ b/cmake/configs/qurt_eagle_default.cmake
@@ -74,6 +74,7 @@ set(config_module_list
 	lib/terrain_estimation
 	lib/runway_takeoff
 	lib/tailsitter_recovery
+	lib/DriverFramework/framework

 	#
 	# QuRT port