diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-08 23:25:10 -0700 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-08 23:25:10 -0700 |
| commit | b2b2e307b61beb4ffc95a07a83432dada7d2a876 (patch) | |
| tree | 10adcdb9054f9561134a3f4cd8f156605814fd41 /src/modules | |
| parent | e18bdfdf65a0e9a948b5f25c3f56930192f83f93 (diff) | |
| parent | e8efbc7f3fe22d2a11189fd83c7252347a6d7f04 (diff) | |
| download | px4-firmware-b2b2e307b61beb4ffc95a07a83432dada7d2a876.tar.gz px4-firmware-b2b2e307b61beb4ffc95a07a83432dada7d2a876.tar.bz2 px4-firmware-b2b2e307b61beb4ffc95a07a83432dada7d2a876.zip | |
Merge pull request #720 from thomasgubler/navigator_rtl_waypointtype
Navigator rtl: fix waypoint type
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/navigator/navigator_main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/navigator/navigator_main.cpp b/src/modules/navigator/navigator_main.cpp index 12fd35a0a..1a45e1345 100644 --- a/src/modules/navigator/navigator_main.cpp +++ b/src/modules/navigator/navigator_main.cpp @@ -1291,7 +1291,7 @@ Navigator::set_rtl_item() _mission_item.yaw = NAN; _mission_item.loiter_radius = _parameters.loiter_radius; _mission_item.loiter_direction = 1; - _mission_item.nav_cmd = NAV_CMD_TAKEOFF; + _mission_item.nav_cmd = NAV_CMD_WAYPOINT; _mission_item.acceptance_radius = _parameters.acceptance_radius; _mission_item.time_inside = 0.0f; _mission_item.pitch_min = 0.0f; @@ -1351,7 +1351,7 @@ Navigator::set_rtl_item() _mission_item.yaw = NAN; _mission_item.loiter_radius = _parameters.loiter_radius; _mission_item.loiter_direction = 1; - _mission_item.nav_cmd = NAV_CMD_WAYPOINT; + _mission_item.nav_cmd = NAV_CMD_LOITER_TIME_LIMIT; _mission_item.acceptance_radius = _parameters.acceptance_radius; _mission_item.time_inside = _parameters.rtl_land_delay < 0.0f ? 0.0f : _parameters.rtl_land_delay; _mission_item.pitch_min = 0.0f; |