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

Merge remote-tracking branch 'upstream/master' into ros_messagelayer_merge

Browse Source 
Conflicts:
	src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp
	src/modules/uORB/topics/vehicle_attitude.h
This commit is contained in:
Thomas Gubler
2015-01-21 14:41:03 +01:00
parent 3a38b0fe35 e8e4a3b5da
commit dcdde8ea88
57 changed files with 2157 additions and 3259 deletions
Download Patch File Download Diff File Expand all files Collapse all files
makefiles/config_px4fmu-v2_default.mk
+1
View File
@@ -71,6 +71,7 @@ MODULES += modules/navigator
MODULES += modules/mavlink
MODULES += modules/gpio_led
MODULES += modules/uavcan
MODULES += modules/land_detector
#
# Estimation modules (EKF/ SO3 / other filters)
makefiles/toolchain_gnu-arm-eabi.mk
+1 -1
View File
@@ -50,7 +50,7 @@ OBJDUMP = $(CROSSDEV)objdump
# Check if the right version of the toolchain is available
#
CROSSDEV_VER_SUPPORTED = 4.7.4 4.7.5 4.7.6 4.8.4
CROSSDEV_VER_SUPPORTED = 4.7.4 4.7.5 4.7.6 4.8.4 4.9.3
CROSSDEV_VER_FOUND = $(shell $(CC) -dumpversion)
ifeq (,$(findstring $(CROSSDEV_VER_FOUND), $(CROSSDEV_VER_SUPPORTED)))