diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-09 09:20:20 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-09 09:20:20 +0200 |
| commit | fc4c4c0bd1654c2bee929c8cebb90d6bf2352d13 (patch) | |
| tree | fa17cbff98be2634ad763153c244330f2294b407 /src/modules | |
| parent | 88194c597132b5590be8ea02711f28e4ca4c6598 (diff) | |
| parent | b2b2e307b61beb4ffc95a07a83432dada7d2a876 (diff) | |
| download | px4-firmware-fc4c4c0bd1654c2bee929c8cebb90d6bf2352d13.tar.gz px4-firmware-fc4c4c0bd1654c2bee929c8cebb90d6bf2352d13.tar.bz2 px4-firmware-fc4c4c0bd1654c2bee929c8cebb90d6bf2352d13.zip | |
Merge branch 'master' of github.com:PX4/Firmware
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; |