aboutsummaryrefslogtreecommitdiff
path: root/makefiles/config_px4fmu-v2_default.mk
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-08-27 16:11:41 +0200
committerLorenz Meier <lm@inf.ethz.ch>2013-08-27 16:11:41 +0200
commit0104f070c6f469df6acdb308ae54638e017813c0 (patch)
tree3fbfa7ef47472d266813574007f9f81728747c66 /makefiles/config_px4fmu-v2_default.mk
parenta897b3d88e5d1c3e8c005d0d5fd7b0dacd434ed0 (diff)
parent3380d40a7d9a8d1946510fab42abdc7a3a6f1525 (diff)
downloadpx4-firmware-0104f070c6f469df6acdb308ae54638e017813c0.tar.gz
px4-firmware-0104f070c6f469df6acdb308ae54638e017813c0.tar.bz2
px4-firmware-0104f070c6f469df6acdb308ae54638e017813c0.zip
Merge branch 'multirotor' into fixedwing_l1
Diffstat (limited to 'makefiles/config_px4fmu-v2_default.mk')
-rw-r--r--makefiles/config_px4fmu-v2_default.mk10
1 files changed, 9 insertions, 1 deletions
diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk
index bd18a25cd..f0acada7b 100644
--- a/makefiles/config_px4fmu-v2_default.mk
+++ b/makefiles/config_px4fmu-v2_default.mk
@@ -3,9 +3,11 @@
#
#
-# Use the configuration's ROMFS.
+# Use the configuration's ROMFS, copy the px4iov2 firmware into
+# the ROMFS if it's available
#
ROMFS_ROOT = $(PX4_BASE)/ROMFS/px4fmu_common
+ROMFS_OPTIONAL_FILES = $(PX4_BASE)/Images/px4io-v2_default.bin
#
# Board support modules
@@ -85,6 +87,12 @@ MODULES += modules/multirotor_pos_control
MODULES += modules/sdlog2
#
+# Unit tests
+#
+MODULES += modules/unit_test
+MODULES += modules/commander/commander_tests
+
+#
# Library modules
#
MODULES += modules/systemlib