diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-16 10:23:41 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-16 10:23:41 +0100 |
| commit | 851415e48ea428f16a48ac558f6cb6b9aef0c171 (patch) | |
| tree | b922228a56b78744cb1743cc12a9e60b73042826 /makefiles | |
| parent | 71f6a34367794a887704e2898f8a10101bacfb12 (diff) | |
| parent | aa40c69853be0dc7e79bc3084472b77f9667c1f1 (diff) | |
| download | px4-firmware-851415e48ea428f16a48ac558f6cb6b9aef0c171.tar.gz px4-firmware-851415e48ea428f16a48ac558f6cb6b9aef0c171.tar.bz2 px4-firmware-851415e48ea428f16a48ac558f6cb6b9aef0c171.zip | |
Merge commit 'aa40c69853be0dc7e79bc3084472b77f9667c1f1' into dev_ros_mcatt
Conflicts:
makefiles/config_px4fmu-v2_test.mk
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/config_px4fmu-v2_test.mk | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/makefiles/config_px4fmu-v2_test.mk b/makefiles/config_px4fmu-v2_test.mk index 844f1236a..fa2c83262 100644 --- a/makefiles/config_px4fmu-v2_test.mk +++ b/makefiles/config_px4fmu-v2_test.mk @@ -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 |