aboutsummaryrefslogtreecommitdiff
path: root/makefiles
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-09-10 14:08:35 +0200
committerLorenz Meier <lm@inf.ethz.ch>2013-09-10 14:08:35 +0200
commit34a8c2de9ccce28523be901bf4476bbe418b74c4 (patch)
treeaf42c3ef343314318d805d3d02a102cca53d6288 /makefiles
parent7d9f49adc0fad3c4a68e70eeecee6a8b83d87ade (diff)
downloadpx4-firmware-34a8c2de9ccce28523be901bf4476bbe418b74c4.tar.gz
px4-firmware-34a8c2de9ccce28523be901bf4476bbe418b74c4.tar.bz2
px4-firmware-34a8c2de9ccce28523be901bf4476bbe418b74c4.zip
Added position controller to default set
Diffstat (limited to 'makefiles')
-rw-r--r--makefiles/config_px4fmu-v1_default.mk3
-rw-r--r--makefiles/config_px4fmu-v2_default.mk3
2 files changed, 4 insertions, 2 deletions
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk
index 7bb5dc62e..bd41f68b6 100644
--- a/makefiles/config_px4fmu-v1_default.mk
+++ b/makefiles/config_px4fmu-v1_default.mk
@@ -79,7 +79,7 @@ MODULES += examples/flow_position_estimator
# Vehicle Control
#
#MODULES += modules/segway # XXX needs state machine update
-#MODULES += modules/fw_pos_control_l1
+MODULES += modules/fw_pos_control_l1
MODULES += modules/fw_att_control
MODULES += modules/multirotor_att_control
MODULES += modules/multirotor_pos_control
@@ -112,6 +112,7 @@ LIBRARIES += lib/mathlib/CMSIS
MODULES += lib/mathlib
MODULES += lib/mathlib/math/filter
MODULES += lib/ecl
+MODULES += lib/external_lgpl
MODULES += lib/geo
#
diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk
index d9dab1a2c..ba0beec3e 100644
--- a/makefiles/config_px4fmu-v2_default.mk
+++ b/makefiles/config_px4fmu-v2_default.mk
@@ -76,7 +76,7 @@ MODULES += examples/flow_position_estimator
# Vehicle Control
#
#MODULES += modules/segway # XXX needs state machine update
-#MODULES += modules/fw_pos_control_l1
+MODULES += modules/fw_pos_control_l1
MODULES += modules/fw_att_control
MODULES += modules/multirotor_att_control
MODULES += modules/multirotor_pos_control
@@ -107,6 +107,7 @@ LIBRARIES += lib/mathlib/CMSIS
MODULES += lib/mathlib
MODULES += lib/mathlib/math/filter
MODULES += lib/ecl
+MODULES += lib/external_lgpl
MODULES += lib/geo
#