aboutsummaryrefslogtreecommitdiff
path: root/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2014-06-11 23:23:54 +0200
committerThomas Gubler <thomasgubler@gmail.com>2014-06-11 23:23:54 +0200
commit214a8cab492a796d331bf6ac7fa5519e6e753c25 (patch)
tree094431390822a7f5eef27d6238de9ffe6f2e106a /src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
parent8a8d46625bb8ffd38d144c22eab35d84667ab0f2 (diff)
parentf4898b94c6fd86d9087ee98634cf543fc1fdcbeb (diff)
downloadpx4-firmware-214a8cab492a796d331bf6ac7fa5519e6e753c25.tar.gz
px4-firmware-214a8cab492a796d331bf6ac7fa5519e6e753c25.tar.bz2
px4-firmware-214a8cab492a796d331bf6ac7fa5519e6e753c25.zip
Merge remote-tracking branch 'upstream/navigator_rewrite' into navigator_rewrite_estimator
Diffstat (limited to 'src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp')
-rw-r--r--src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp2
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 070d7377a..1bb955173 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
@@ -1452,7 +1452,7 @@ void FixedwingPositionControl::tecs_update_pitch_throttle(float alt_sp, float v_
if (ground_speed_length > FLT_EPSILON) {
flightPathAngle = -asinf(ground_speed(2)/ground_speed_length);
}
- fwPosctrl::mTecs::LimitOverride limitOverride;
+ fwPosctrl::LimitOverride limitOverride;
if (climbout_mode) {
limitOverride.enablePitchMinOverride(M_RAD_TO_DEG_F * climbout_pitch_min_rad);
} else {