|
|
@ -576,18 +576,6 @@ Navigator::run() |
|
|
|
switch (_rtl.get_rtl_type()) { |
|
|
|
switch (_rtl.get_rtl_type()) { |
|
|
|
case RTL::RTL_TYPE_MISSION_LANDING: |
|
|
|
case RTL::RTL_TYPE_MISSION_LANDING: |
|
|
|
case RTL::RTL_TYPE_CLOSEST: |
|
|
|
case RTL::RTL_TYPE_CLOSEST: |
|
|
|
if (rtl_activated) { |
|
|
|
|
|
|
|
if (_rtl.get_rtl_type() == RTL::RTL_TYPE_MISSION_LANDING) { |
|
|
|
|
|
|
|
mavlink_log_info(get_mavlink_log_pub(), "RTL to mission landing activated\t"); |
|
|
|
|
|
|
|
events::send(events::ID("navigator_rtl_landing_activated"), events::Log::Info, "RTL to mission landing activated"); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
mavlink_log_info(get_mavlink_log_pub(), "RTL Closest landing point activated\t"); |
|
|
|
|
|
|
|
events::send(events::ID("navigator_rtl_closest_point_activated"), events::Log::Info, |
|
|
|
|
|
|
|
"RTL to closest landing point activated"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!rtl_activated && _rtl.getClimbAndReturnDone() |
|
|
|
if (!rtl_activated && _rtl.getClimbAndReturnDone() |
|
|
|
&& _rtl.getDestinationTypeMissionLanding()) { |
|
|
|
&& _rtl.getDestinationTypeMissionLanding()) { |
|
|
|