diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-21 21:53:26 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-21 21:53:26 +0200 |
| commit | 8db5c932f97d7e6d554fd7e848c170f7e7093a8c (patch) | |
| tree | 9fac5827025ebba21d08155c738654afa530b04a /src/modules/fw_pos_control_l1 | |
| parent | a28a38005c6c9fdd43e6e7182b93d274d4f4369c (diff) | |
| parent | b9b81beb17eb449921f11f46bc419056dce03852 (diff) | |
| download | px4-firmware-8db5c932f97d7e6d554fd7e848c170f7e7093a8c.tar.gz px4-firmware-8db5c932f97d7e6d554fd7e848c170f7e7093a8c.tar.bz2 px4-firmware-8db5c932f97d7e6d554fd7e848c170f7e7093a8c.zip | |
Merge branch 'fwattrobustify' into mtecs
Diffstat (limited to 'src/modules/fw_pos_control_l1')
| -rw-r--r-- | src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp b/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp index 95165ecaa..4f40682ea 100644 --- a/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp +++ b/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp @@ -434,8 +434,8 @@ FixedwingPositionControl::FixedwingPositionControl() : land_motor_lim(false), land_onslope(false), launch_detected(false), - last_manual(false), usePreTakeoffThrust(false), + last_manual(false), flare_curve_alt_rel_last(0.0f), launchDetector(), _airspeed_error(0.0f), |