diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-11-05 08:42:20 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-11-05 08:42:20 +0100 |
| commit | d7064884dbba80514fee6946ead41613466fa571 (patch) | |
| tree | 856e985c61794537867165cfae59cfcd2588e4a2 /src/modules/fw_pos_control_l1 | |
| parent | 5a5d758ce4dc72d3eb5809124134247c4cc0038f (diff) | |
| parent | 1358d4cb88e70370014410353faf3e51afb1ceb6 (diff) | |
| download | px4-firmware-d7064884dbba80514fee6946ead41613466fa571.tar.gz px4-firmware-d7064884dbba80514fee6946ead41613466fa571.tar.bz2 px4-firmware-d7064884dbba80514fee6946ead41613466fa571.zip | |
Merge branch 'master' into fw_autoland
nored, and an empty message aborts
Diffstat (limited to 'src/modules/fw_pos_control_l1')
| -rw-r--r-- | src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp | 5 |
1 files changed, 2 insertions, 3 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 1a263b741..536380129 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 @@ -470,7 +470,7 @@ FixedwingPositionControl::parameters_update() _tecs.set_speed_weight(_parameters.speed_weight); _tecs.set_pitch_damping(_parameters.pitch_damping); _tecs.set_indicated_airspeed_min(_parameters.airspeed_min); - _tecs.set_indicated_airspeed_max(_parameters.airspeed_min); + _tecs.set_indicated_airspeed_max(_parameters.airspeed_max); _tecs.set_max_climb_rate(_parameters.max_climb_rate); /* sanity check parameters */ @@ -520,7 +520,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 { @@ -533,7 +532,7 @@ FixedwingPositionControl::vehicle_airspeed_poll() /* update TECS state */ _tecs.enable_airspeed(_airspeed_valid); - return false; + return airspeed_updated; } void |