diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-06-01 13:46:02 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-06-01 13:46:02 +0200 |
| commit | a0d14b94af450584355964249e813c414b6adc8b (patch) | |
| tree | ed82bb9070dd23c8dd1bcbc9a934c0af8f4b2837 | |
| parent | b849f721763d8d67a4e994aaf06f8607b2ab918d (diff) | |
| parent | 436cefd88c797992ddd066c13ec3a32ea01f1dcf (diff) | |
| download | px4-firmware-a0d14b94af450584355964249e813c414b6adc8b.tar.gz px4-firmware-a0d14b94af450584355964249e813c414b6adc8b.tar.bz2 px4-firmware-a0d14b94af450584355964249e813c414b6adc8b.zip | |
Merge remote-tracking branch 'upstream/mtecs' into mtecs
| -rw-r--r-- | makefiles/config_px4fmu-v1_default.mk | 6 | ||||
| -rw-r--r-- | src/lib/launchdetection/module.mk | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk index 810e008ae..e4bc6fecf 100644 --- a/makefiles/config_px4fmu-v1_default.mk +++ b/makefiles/config_px4fmu-v1_default.mk @@ -52,7 +52,6 @@ MODULES += systemcmds/pwm MODULES += systemcmds/esc_calib MODULES += systemcmds/reboot MODULES += systemcmds/top -MODULES += systemcmds/tests MODULES += systemcmds/config MODULES += systemcmds/nshterm MODULES += systemcmds/dumpfile @@ -67,12 +66,11 @@ MODULES += modules/mavlink MODULES += modules/gpio_led # -# Estimation modules (EKF/ SO3 / other filters) +# Estimation modules (EKF / other filters) # MODULES += modules/attitude_estimator_ekf MODULES += modules/ekf_att_pos_estimator MODULES += modules/position_estimator_inav -#MODULES += examples/flow_position_estimator # # Vehicle Control @@ -81,8 +79,6 @@ MODULES += modules/fw_pos_control_l1 MODULES += modules/fw_att_control MODULES += modules/mc_att_control MODULES += modules/mc_pos_control -#MODULES += examples/flow_position_control -#MODULES += examples/flow_speed_control # # Logging diff --git a/src/lib/launchdetection/module.mk b/src/lib/launchdetection/module.mk index de0174e37..d92f0bb45 100644 --- a/src/lib/launchdetection/module.mk +++ b/src/lib/launchdetection/module.mk @@ -38,3 +38,5 @@ SRCS = LaunchDetector.cpp \ CatapultLaunchMethod.cpp \ launchdetection_params.c + +MAXOPTIMIZATION = -Os |