diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2013-06-15 11:49:14 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2013-06-15 11:49:14 +0400 |
| commit | 4c6cf3037d0371a7497d6b5917d8dabe1caf5ed2 (patch) | |
| tree | 30d1044357857bb29e168a113b6c3cfdfa4a2224 /makefiles | |
| parent | 38ca3bd78a9b415df4a260a8cba43e2c13703972 (diff) | |
| parent | b714c5c9d1d38132df5cf4bff9a1fd92163be550 (diff) | |
| download | px4-firmware-4c6cf3037d0371a7497d6b5917d8dabe1caf5ed2.tar.gz px4-firmware-4c6cf3037d0371a7497d6b5917d8dabe1caf5ed2.tar.bz2 px4-firmware-4c6cf3037d0371a7497d6b5917d8dabe1caf5ed2.zip | |
Merge commit 'b714c5c9d1d38132df5cf4bff9a1fd92163be550' into seatbelt_multirotor
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/config_px4fmu_default.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/makefiles/config_px4fmu_default.mk b/makefiles/config_px4fmu_default.mk index 07ed5e633..c7a6ce040 100644 --- a/makefiles/config_px4fmu_default.mk +++ b/makefiles/config_px4fmu_default.mk @@ -63,10 +63,10 @@ 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 += modules/position_estimator_inav +MODULES += examples/flow_position_estimator # # Vehicle Control @@ -76,11 +76,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 # |