aboutsummaryrefslogtreecommitdiff
path: root/src/modules/navigator
diff options
context:
space:
mode:
authorAnton Babushkin <anton.babushkin@me.com>2014-01-26 15:46:14 +0100
committerAnton Babushkin <anton.babushkin@me.com>2014-01-26 15:46:14 +0100
commit9e9105048ac70b7abaa40ef8ce3f6f75910ada0a (patch)
treefb62f22109d830b2b4dae95f726353bc4ee342a3 /src/modules/navigator
parentc841929e3f617e67adec6606b3ec6517aa455834 (diff)
downloadpx4-firmware-9e9105048ac70b7abaa40ef8ce3f6f75910ada0a.tar.gz
px4-firmware-9e9105048ac70b7abaa40ef8ce3f6f75910ada0a.tar.bz2
px4-firmware-9e9105048ac70b7abaa40ef8ce3f6f75910ada0a.zip
commander, navigator: failsafe fixes, mavlink messages cleanup
Diffstat (limited to 'src/modules/navigator')
-rw-r--r--src/modules/navigator/navigator_main.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/modules/navigator/navigator_main.cpp b/src/modules/navigator/navigator_main.cpp
index 7c37237ff..4be9f055b 100644
--- a/src/modules/navigator/navigator_main.cpp
+++ b/src/modules/navigator/navigator_main.cpp
@@ -1072,7 +1072,6 @@ Navigator::start_mission()
{
_need_takeoff = true;
- mavlink_log_info(_mavlink_fd, "[navigator] mission started");
set_mission_item();
}
@@ -1201,7 +1200,6 @@ Navigator::start_rtl()
}
_reset_loiter_pos = true;
- mavlink_log_info(_mavlink_fd, "[navigator] RTL started");
set_rtl_item();
}
@@ -1222,8 +1220,6 @@ Navigator::start_land()
_pos_sp_triplet.current.loiter_direction = 1;
_pos_sp_triplet.current.loiter_radius = _parameters.loiter_radius;
_pos_sp_triplet.current.yaw = NAN;
-
- mavlink_log_info(_mavlink_fd, "[navigator] land started");
}
void
@@ -1259,7 +1255,7 @@ Navigator::set_rtl_item()
_pos_sp_triplet.next.valid = false;
- mavlink_log_info(_mavlink_fd, "[navigator] RTL: climb to %.1fm", climb_alt - _home_pos.alt);
+ mavlink_log_info(_mavlink_fd, "[navigator] RTL: climb to %.1fm above home", climb_alt - _home_pos.alt);
break;
}
@@ -1312,7 +1308,7 @@ Navigator::set_rtl_item()
_pos_sp_triplet.next.valid = false;
- mavlink_log_info(_mavlink_fd, "[navigator] RTL: descend to %.1fm AMSL", _mission_item.altitude);
+ mavlink_log_info(_mavlink_fd, "[navigator] RTL: descend to %.1fm above home", _mission_item.altitude - _home_pos.alt);
break;
}