diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-06-17 08:44:07 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-06-17 08:44:07 +0200 |
| commit | 92e0687022042dcda166e78205477cc592acefca (patch) | |
| tree | 7c43281ef14c54051b1333bf43e2020765a30b53 /makefiles/config_px4fmu-v1_default.mk | |
| parent | b2ff8b5e1ad80f86aa2efdfdf06b7c55de8d32c0 (diff) | |
| parent | c240e843aa2ba88fa0c333dd8f099b37f1e1ca13 (diff) | |
| download | px4-firmware-92e0687022042dcda166e78205477cc592acefca.tar.gz px4-firmware-92e0687022042dcda166e78205477cc592acefca.tar.bz2 px4-firmware-92e0687022042dcda166e78205477cc592acefca.zip | |
Merge branch 'master' of github.com:PX4/Firmware into integration
Diffstat (limited to 'makefiles/config_px4fmu-v1_default.mk')
| -rw-r--r-- | makefiles/config_px4fmu-v1_default.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk index 2b0973e6e..213eb651b 100644 --- a/makefiles/config_px4fmu-v1_default.mk +++ b/makefiles/config_px4fmu-v1_default.mk @@ -63,9 +63,9 @@ MODULES += modules/gpio_led # MODULES += modules/attitude_estimator_ekf MODULES += modules/attitude_estimator_so3_comp -#MODULES += modules/position_estimator_mc MODULES += modules/position_estimator MODULES += modules/att_pos_estimator_ekf +MODULES += examples/flow_position_estimator # # Vehicle Control @@ -75,11 +75,12 @@ MODULES += modules/fixedwing_att_control MODULES += modules/fixedwing_pos_control MODULES += modules/multirotor_att_control MODULES += modules/multirotor_pos_control +MODULES += examples/flow_position_control +MODULES += examples/flow_speed_control # # Logging # -MODULES += modules/sdlog MODULES += modules/sdlog2 # |