diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2013-12-13 21:07:27 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2013-12-13 21:07:27 +0100 |
| commit | c3cbaf5deb00577efa9198f246ebc6011284ff34 (patch) | |
| tree | 8f40fef6a2230cf6be262443ac520807cc66aba2 /makefiles | |
| parent | 54e739926d3414e29b13d2aa14ebb94fd8ffd4f4 (diff) | |
| parent | 0b9b68f0d96f59c9cd406547ee52fb52617a298f (diff) | |
| download | px4-firmware-c3cbaf5deb00577efa9198f246ebc6011284ff34.tar.gz px4-firmware-c3cbaf5deb00577efa9198f246ebc6011284ff34.tar.bz2 px4-firmware-c3cbaf5deb00577efa9198f246ebc6011284ff34.zip | |
Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs_navigator_termination_controlgroups
Conflicts:
src/drivers/px4io/px4io.cpp
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/config_px4fmu-v1_backside.mk | 3 | ||||
| -rw-r--r-- | makefiles/config_px4fmu-v1_default.mk | 3 | ||||
| -rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/makefiles/config_px4fmu-v1_backside.mk b/makefiles/config_px4fmu-v1_backside.mk index c07f7ab1a..6da78b287 100644 --- a/makefiles/config_px4fmu-v1_backside.mk +++ b/makefiles/config_px4fmu-v1_backside.mk @@ -69,12 +69,13 @@ MODULES += modules/mavlink_onboard MODULES += modules/gpio_led # -# Estimation modules (EKF / other filters) +# Estimation modules (EKF/ SO3 / other filters) # #MODULES += modules/attitude_estimator_ekf MODULES += modules/att_pos_estimator_ekf #MODULES += modules/position_estimator_inav MODULES += examples/flow_position_estimator +MODULES += modules/attitude_estimator_so3 # # Vehicle Control diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk index 1e1d0f419..f724962b2 100644 --- a/makefiles/config_px4fmu-v1_default.mk +++ b/makefiles/config_px4fmu-v1_default.mk @@ -69,9 +69,10 @@ MODULES += modules/mavlink_onboard MODULES += modules/gpio_led # -# Estimation modules (EKF / other filters) +# Estimation modules (EKF/ SO3 / other filters) # MODULES += modules/attitude_estimator_ekf +MODULES += modules/attitude_estimator_so3 MODULES += modules/att_pos_estimator_ekf 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 b9aec79fe..1f3e4f808 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -68,9 +68,10 @@ MODULES += modules/mavlink MODULES += modules/mavlink_onboard # -# Estimation modules (EKF / other filters) +# Estimation modules (EKF/ SO3 / other filters) # MODULES += modules/attitude_estimator_ekf +MODULES += modules/attitude_estimator_so3 MODULES += modules/att_pos_estimator_ekf MODULES += modules/position_estimator_inav MODULES += examples/flow_position_estimator |