diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-15 13:14:25 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-15 13:14:25 +0200 |
| commit | ba51ab2545bded39b389b7b8c2d862e10fc15b42 (patch) | |
| tree | f8a1c735951fc048448fe01e1576c038df0aacfb /makefiles | |
| parent | 97e6090700510ba5845f50f73c3d47c79368a447 (diff) | |
| parent | ec409a1337a0f9c73cbe54776b254464e3dcd1d3 (diff) | |
| download | px4-firmware-ba51ab2545bded39b389b7b8c2d862e10fc15b42.tar.gz px4-firmware-ba51ab2545bded39b389b7b8c2d862e10fc15b42.tar.bz2 px4-firmware-ba51ab2545bded39b389b7b8c2d862e10fc15b42.zip | |
Merge branch 'ekf_params' of github.com:PX4/Firmware
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/config_px4fmu-v1_default.mk | 2 | ||||
| -rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk index 61a417f30..810e008ae 100644 --- a/makefiles/config_px4fmu-v1_default.mk +++ b/makefiles/config_px4fmu-v1_default.mk @@ -70,7 +70,7 @@ MODULES += modules/gpio_led # Estimation modules (EKF/ SO3 / other filters) # MODULES += modules/attitude_estimator_ekf -MODULES += modules/fw_att_pos_estimator +MODULES += modules/ekf_att_pos_estimator MODULES += modules/position_estimator_inav #MODULES += examples/flow_position_estimator diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index 65ca24325..d6e88859c 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -79,7 +79,7 @@ MODULES += modules/gpio_led # MODULES += modules/attitude_estimator_ekf MODULES += modules/attitude_estimator_so3 -MODULES += modules/fw_att_pos_estimator +MODULES += modules/ekf_att_pos_estimator MODULES += modules/position_estimator_inav MODULES += examples/flow_position_estimator |