Merged master into driver_framework

This commit is contained in:
Lorenz Meier
2015-11-20 09:14:37 +01:00
102 changed files with 2985 additions and 474 deletions
@@ -111,6 +111,8 @@ set(config_module_list
lib/geo_lookup
lib/conversion
lib/launchdetection
lib/terrain_estimation
lib/runway_takeoff
platforms/nuttx
# had to add for cmake, not sure why wasn't in original config
@@ -118,6 +118,8 @@ set(config_module_list
lib/geo_lookup
lib/conversion
lib/launchdetection
lib/terrain_estimation
lib/runway_takeoff
platforms/nuttx
# had to add for cmake, not sure why wasn't in original config
+2
View File
@@ -38,6 +38,8 @@ set(config_module_list
lib/geo
lib/geo_lookup
lib/conversion
lib/terrain_estimation
lib/runway_takeoff
platforms/common
platforms/posix/px4_layer
+2
View File
@@ -56,6 +56,8 @@ set(config_module_list
lib/geo
lib/geo_lookup
lib/launchdetection
lib/terrain_estimation
lib/runway_takeoff
)
set(config_extra_builtin_cmds
+2
View File
@@ -47,6 +47,8 @@ set(config_module_list
lib/geo
lib/geo_lookup
lib/conversion
lib/terrain_estimation
lib/runway_takeoff
modules/controllib
#
+2
View File
@@ -70,6 +70,8 @@ set(config_module_list
lib/geo
lib/geo_lookup
lib/conversion
lib/terrain_estimation
lib/runway_takeoff
#
# QuRT port
+2
View File
@@ -52,6 +52,8 @@ set(config_module_list
lib/geo_lookup
lib/conversion
lib/ecl
lib/terrain_estimation
lib/runway_takeoff
#
# QuRT port