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>2013-11-03 12:12:28 +0100
committerThomas Gubler <thomasgubler@gmail.com>2013-11-03 12:12:28 +0100
commit3b76959df5fd6cf4f0711f3e9045e53c70722ee3 (patch)
treec7078244f63ad336fe989d0eeb9d3a0b9c5eb875 /src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
parent18cfc383e82d722a45f924a2df0fd2943213318f (diff)
parent64c2165e8be17a8309594a0aeacec7f3aedee4c0 (diff)
downloadpx4-firmware-3b76959df5fd6cf4f0711f3e9045e53c70722ee3.tar.gz
px4-firmware-3b76959df5fd6cf4f0711f3e9045e53c70722ee3.tar.bz2
px4-firmware-3b76959df5fd6cf4f0711f3e9045e53c70722ee3.zip
Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs
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.cpp3
1 files changed, 1 insertions, 2 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 0f26a8f00..5f91eb61d 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
@@ -526,7 +526,6 @@ FixedwingPositionControl::vehicle_airspeed_poll()
orb_copy(ORB_ID(airspeed), _airspeed_sub, &_airspeed);
_airspeed_valid = true;
_airspeed_last_valid = hrt_absolute_time();
- return true;
} else {
@@ -539,7 +538,7 @@ FixedwingPositionControl::vehicle_airspeed_poll()
/* update TECS state */
_tecs.enable_airspeed(_airspeed_valid);
- return false;
+ return airspeed_updated;
}
void