fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-24 03:03:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

navigator: more reset reached calls

Browse Source
This commit is contained in:
Julian Oes
2014-11-11 21:45:13 +10:00
parent d98831c3b5
commit cf2baac516
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/navigator/datalinkloss.cpp
+4
View File
@@ -156,6 +156,7 @@ DataLinkLoss::set_dll_item()
/* Request flight termination from the commander */ /* Request flight termination from the commander */
_navigator->get_mission_result()->flight_termination = true; _navigator->get_mission_result()->flight_termination = true;
_navigator->publish_mission_result(); _navigator->publish_mission_result();
reset_mission_item_reached();
warnx("not switched to manual: request flight termination"); warnx("not switched to manual: request flight termination");
pos_sp_triplet->previous.valid = false; pos_sp_triplet->previous.valid = false;
pos_sp_triplet->current.valid = false; pos_sp_triplet->current.valid = false;
@@ -188,6 +189,7 @@ DataLinkLoss::advance_dll()
mavlink_log_info(_navigator->get_mavlink_fd(), "#audio: too many DL losses, fly to airfield home"); mavlink_log_info(_navigator->get_mavlink_fd(), "#audio: too many DL losses, fly to airfield home");
_navigator->get_mission_result()->stay_in_failsafe = true; _navigator->get_mission_result()->stay_in_failsafe = true;
_navigator->publish_mission_result(); _navigator->publish_mission_result();
reset_mission_item_reached();
_dll_state = DLL_STATE_FLYTOAIRFIELDHOMEWP; _dll_state = DLL_STATE_FLYTOAIRFIELDHOMEWP;
} else { } else {
if (!_param_skipcommshold.get()) { if (!_param_skipcommshold.get()) {
@@ -208,6 +210,7 @@ DataLinkLoss::advance_dll()
_dll_state = DLL_STATE_FLYTOAIRFIELDHOMEWP; _dll_state = DLL_STATE_FLYTOAIRFIELDHOMEWP;
_navigator->get_mission_result()->stay_in_failsafe = true; _navigator->get_mission_result()->stay_in_failsafe = true;
_navigator->publish_mission_result(); _navigator->publish_mission_result();
reset_mission_item_reached();
break; break;
case DLL_STATE_FLYTOAIRFIELDHOMEWP: case DLL_STATE_FLYTOAIRFIELDHOMEWP:
_dll_state = DLL_STATE_TERMINATE; _dll_state = DLL_STATE_TERMINATE;
@@ -215,6 +218,7 @@ DataLinkLoss::advance_dll()
mavlink_log_info(_navigator->get_mavlink_fd(), "#audio: no manual control, terminating"); mavlink_log_info(_navigator->get_mavlink_fd(), "#audio: no manual control, terminating");
_navigator->get_mission_result()->stay_in_failsafe = true; _navigator->get_mission_result()->stay_in_failsafe = true;
_navigator->publish_mission_result(); _navigator->publish_mission_result();
reset_mission_item_reached();
break; break;
case DLL_STATE_TERMINATE: case DLL_STATE_TERMINATE:
warnx("dll end"); warnx("dll end");
src/modules/navigator/rcloss.cpp
+2
View File
@@ -163,6 +163,7 @@ RCLoss::advance_rcl()
_rcl_state = RCL_STATE_TERMINATE; _rcl_state = RCL_STATE_TERMINATE;
_navigator->get_mission_result()->stay_in_failsafe = true; _navigator->get_mission_result()->stay_in_failsafe = true;
_navigator->publish_mission_result(); _navigator->publish_mission_result();
reset_mission_item_reached();
} }
break; break;
case RCL_STATE_LOITER: case RCL_STATE_LOITER:
@@ -171,6 +172,7 @@ RCLoss::advance_rcl()
mavlink_log_info(_navigator->get_mavlink_fd(), "#audio: RC not regained, terminating"); mavlink_log_info(_navigator->get_mavlink_fd(), "#audio: RC not regained, terminating");
_navigator->get_mission_result()->stay_in_failsafe = true; _navigator->get_mission_result()->stay_in_failsafe = true;
_navigator->publish_mission_result(); _navigator->publish_mission_result();
reset_mission_item_reached();
break; break;
case RCL_STATE_TERMINATE: case RCL_STATE_TERMINATE:
warnx("rcl end"); warnx("rcl end");