diff options
| author | Julian Oes <julian@oes.ch> | 2014-03-30 13:40:06 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-03-30 13:40:06 +0200 |
| commit | 5d3660b6a929f33ae18dfcb617c6879847637dac (patch) | |
| tree | 16eca446b5299d69eb46a9b7d266b88c5c65bd3a /makefiles | |
| parent | 1d75f3eb8a1dba5b919c417b27a44e16ddcb0d32 (diff) | |
| parent | 60728bb6a6211407a1db12e7c015272cf998d928 (diff) | |
| download | px4-firmware-5d3660b6a929f33ae18dfcb617c6879847637dac.tar.gz px4-firmware-5d3660b6a929f33ae18dfcb617c6879847637dac.tar.bz2 px4-firmware-5d3660b6a929f33ae18dfcb617c6879847637dac.zip | |
Merge remote-tracking branch 'px4/paul_estimator_numeric' into test_bottle_drop_paul
Conflicts:
src/modules/uORB/topics/vehicle_command.h
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 651c2ac38..532e978d0 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/att_pos_estimator_ekf +MODULES += modules/fw_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 3e79fac79..5677684b3 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/att_pos_estimator_ekf +MODULES += modules/fw_att_pos_estimator MODULES += modules/position_estimator_inav MODULES += examples/flow_position_estimator |