aboutsummaryrefslogtreecommitdiff
path: root/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
diff options
context:
space:
mode:
authorJulian Oes <julian@oes.ch>2014-06-12 19:12:44 +0200
committerJulian Oes <julian@oes.ch>2014-06-12 19:12:44 +0200
commit59ae8cc054e941aa28edb2b668732ff4024e1cd5 (patch)
tree1032bbf0da29b1a69a6be60add55a7349c01765d /src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
parentd48a8bc073a3aa5f515c582a1c2c3cae58a8d783 (diff)
parentf4898b94c6fd86d9087ee98634cf543fc1fdcbeb (diff)
downloadpx4-firmware-59ae8cc054e941aa28edb2b668732ff4024e1cd5.tar.gz
px4-firmware-59ae8cc054e941aa28edb2b668732ff4024e1cd5.tar.bz2
px4-firmware-59ae8cc054e941aa28edb2b668732ff4024e1cd5.zip
Merge branch 'navigator_rewrite' of github.com:PX4/Firmware into navigator_rewrite
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 {