Merge commit 'aa40c69853be0dc7e79bc3084472b77f9667c1f1' into dev_ros_mcatt

Conflicts:
	makefiles/config_px4fmu-v2_test.mk
This commit is contained in:
Thomas Gubler
2014-12-16 10:23:41 +01:00
55 changed files with 465 additions and 1035 deletions
+13 -3
View File
@@ -72,14 +72,24 @@ LIBRARIES += lib/mathlib/CMSIS
MODULES += platforms/nuttx
#
# Modules to test-build, but not useful for test environment
# Example modules to test-build
#
MODULES += examples/flow_position_estimator
MODULES += examples/fixedwing_control
MODULES += examples/hwtest
MODULES += examples/matlab_csv_serial
MODULES += examples/px4_daemon_app
MODULES += examples/px4_mavlink_debug
MODULES += examples/px4_simple_app
#
# Drivers / modules to test build, but not useful for test environment
#
MODULES += modules/attitude_estimator_so3
MODULES += drivers/pca8574
MODULES += examples/flow_position_estimator
#
# Libraries
# Tests
#
MODULES += modules/unit_test
MODULES += modules/mavlink/mavlink_tests