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

Merge remote-tracking branch 'upstream/obcfailsafe' into swissfang

Browse Source 
Conflicts:
	src/lib/external_lgpl/tecs/tecs.cpp
	src/modules/commander/commander_params.c
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
	src/modules/navigator/navigator_main.cpp
This commit is contained in:
Thomas Gubler
2014-09-30 15:38:27 +02:00
parent 15eee418a0 ab400089bc
commit cc05f0f185
30 changed files with 1595 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files
makefiles/config_px4fmu-v1_default.mk
-3
View File
@@ -27,8 +27,6 @@ MODULES += drivers/ms5611
MODULES += drivers/mb12xx
MODULES += drivers/gps
MODULES += drivers/hil
MODULES += drivers/hott/hott_telemetry
MODULES += drivers/hott/hott_sensors
MODULES += drivers/blinkm
MODULES += drivers/rgbled
MODULES += drivers/mkblctrl
@@ -42,7 +40,6 @@ MODULES += modules/sensors
# System commands
#
MODULES += systemcmds/mtd
MODULES += systemcmds/bl_update
MODULES += systemcmds/mixer
MODULES += systemcmds/param
MODULES += systemcmds/perf
makefiles/config_px4fmu-v2_test.mk
+3
View File
@@ -54,6 +54,9 @@ MODULES += lib/conversion
#
LIBRARIES += lib/mathlib/CMSIS
MODULES += modules/unit_test
MODULES += modules/mavlink/mavlink_tests
#
# Transitional support - add commands from the NuttX export archive.
#