diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-11-24 07:41:26 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-11-24 07:41:26 +0100 |
| commit | c37ff71e625310cdc777719a04c3702d9afa1f7f (patch) | |
| tree | 714ecb7b510e7ff53080ce3f0caebe8b128a26f5 /makefiles/config_px4fmu-v2_test.mk | |
| parent | f36f54c621cb5b36d345c5a26f72e89fc948fa65 (diff) | |
| parent | 512779907e06f059a15d54c88d71b73aad9aced0 (diff) | |
| download | px4-firmware-c37ff71e625310cdc777719a04c3702d9afa1f7f.tar.gz px4-firmware-c37ff71e625310cdc777719a04c3702d9afa1f7f.tar.bz2 px4-firmware-c37ff71e625310cdc777719a04c3702d9afa1f7f.zip | |
Merge remote-tracking branch 'upstream/master' into ros
Conflicts:
makefiles/config_px4fmu-v2_test.mk
Diffstat (limited to 'makefiles/config_px4fmu-v2_test.mk')
| -rw-r--r-- | makefiles/config_px4fmu-v2_test.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/makefiles/config_px4fmu-v2_test.mk b/makefiles/config_px4fmu-v2_test.mk index 67934b8e4..8aa8badc3 100644 --- a/makefiles/config_px4fmu-v2_test.mk +++ b/makefiles/config_px4fmu-v2_test.mk @@ -53,7 +53,14 @@ LIBRARIES += lib/mathlib/CMSIS MODULES += platforms/nuttx # -# Tests +# Modules to test-build, but not useful for test environment +# +MODULES += modules/attitude_estimator_so3 +MODULES += drivers/pca8574 +MODULES += examples/flow_position_estimator + +# +# Libraries # MODULES += modules/unit_test MODULES += modules/mavlink/mavlink_tests |