diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-06-10 15:01:44 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-06-10 15:01:44 +0200 |
| commit | 9444def5f861745da2716a443026e3d0bf061161 (patch) | |
| tree | b25a9429d78fab148debc9e1f2d31f6d3a0afd54 /makefiles/config_px4fmu_default.mk | |
| parent | 308ec6001a2e1ac31ea818b1d482a34b8ed0099b (diff) | |
| parent | 42ce3112ad645e53788463180c350279b243b02e (diff) | |
| download | px4-firmware-9444def5f861745da2716a443026e3d0bf061161.tar.gz px4-firmware-9444def5f861745da2716a443026e3d0bf061161.tar.bz2 px4-firmware-9444def5f861745da2716a443026e3d0bf061161.zip | |
Merge branch 'master' into fmuv2_bringup
Diffstat (limited to 'makefiles/config_px4fmu_default.mk')
| -rw-r--r-- | makefiles/config_px4fmu_default.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/makefiles/config_px4fmu_default.mk b/makefiles/config_px4fmu_default.mk index c269996f6..7117a8218 100644 --- a/makefiles/config_px4fmu_default.mk +++ b/makefiles/config_px4fmu_default.mk @@ -57,12 +57,14 @@ MODULES += systemcmds/tests MODULES += modules/commander MODULES += modules/mavlink MODULES += modules/mavlink_onboard +MODULES += modules/gpio_led # # Estimation modules (EKF / other filters) # MODULES += modules/attitude_estimator_ekf -MODULES += modules/position_estimator_mc +MODULES += modules/attitude_estimator_so3_comp +#MODULES += modules/position_estimator_mc MODULES += modules/position_estimator MODULES += modules/att_pos_estimator_ekf @@ -79,6 +81,7 @@ MODULES += modules/multirotor_pos_control # Logging # MODULES += modules/sdlog +MODULES += modules/sdlog2 # # Library modules |