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

Merge branch 'launchdetection' into navigator_new_fw

Browse Source 
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
This commit is contained in:
Thomas Gubler
2013-12-29 19:50:30 +01:00
parent 52960e06c6 ebbe4d2235
commit cf33f2a627
12 changed files with 533 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
makefiles/config_px4fmu-v1_backside.mk
+1
View File
@@ -119,6 +119,7 @@ MODULES += lib/ecl
MODULES += lib/external_lgpl
MODULES += lib/geo
MODULES += lib/conversion
MODULES += lib/launchdetection
#
# Demo apps
makefiles/config_px4fmu-v1_default.mk
+1
View File
@@ -118,6 +118,7 @@ MODULES += lib/ecl
MODULES += lib/external_lgpl
MODULES += lib/geo
MODULES += lib/conversion
MODULES += lib/launchdetection
#
# Demo apps
makefiles/config_px4fmu-v2_default.mk
+1
View File
@@ -116,6 +116,7 @@ MODULES += lib/ecl
MODULES += lib/external_lgpl
MODULES += lib/geo
MODULES += lib/conversion
MODULES += lib/launchdetection
#
# Demo apps
makefiles/config_px4fmu-v2_logging.mk
+1
View File
@@ -116,6 +116,7 @@ MODULES += lib/external_lgpl
MODULES += lib/geo
MODULES += lib/conversion
MODULES += modules/dataman
MODULES += lib/launchdetection
#
# Demo apps