From de0c6d7ca5064f9cf4ca48c7a59f08c5e945bc87 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Fri, 28 Jul 2017 10:37:41 +1000 Subject: [PATCH] Tracker: move try_send_message mission handling up --- AntennaTracker/GCS_Mavlink.cpp | 10 ---------- AntennaTracker/Tracker.h | 1 - 2 files changed, 11 deletions(-) diff --git a/AntennaTracker/GCS_Mavlink.cpp b/AntennaTracker/GCS_Mavlink.cpp index 676cd9ae68..4f13554643 100644 --- a/AntennaTracker/GCS_Mavlink.cpp +++ b/AntennaTracker/GCS_Mavlink.cpp @@ -109,11 +109,6 @@ void Tracker::send_hwstatus(mavlink_channel_t chan) 0); } -void Tracker::send_waypoint_request(mavlink_channel_t chan) -{ - gcs().chan(chan-MAVLINK_COMM_0).queued_waypoint_send(); -} - void Tracker::send_nav_controller_output(mavlink_channel_t chan) { float alt_diff = (g.alt_source == ALT_SOURCE_BARO) ? nav_status.alt_difference_baro : nav_status.alt_difference_gps; @@ -215,11 +210,6 @@ bool GCS_MAVLINK_Tracker::try_send_message(enum ap_message id) queued_param_send(); break; - case MSG_NEXT_WAYPOINT: - CHECK_PAYLOAD_SIZE(MISSION_REQUEST); - tracker.send_waypoint_request(chan); - break; - case MSG_AHRS: CHECK_PAYLOAD_SIZE(AHRS); send_ahrs(tracker.ahrs); diff --git a/AntennaTracker/Tracker.h b/AntennaTracker/Tracker.h index 2ab482c4d0..2f1b2f39f8 100644 --- a/AntennaTracker/Tracker.h +++ b/AntennaTracker/Tracker.h @@ -200,7 +200,6 @@ private: void send_attitude(mavlink_channel_t chan); void send_location(mavlink_channel_t chan); void send_hwstatus(mavlink_channel_t chan); - void send_waypoint_request(mavlink_channel_t chan); void send_nav_controller_output(mavlink_channel_t chan); void send_simstate(mavlink_channel_t chan); void mavlink_check_target(const mavlink_message_t* msg);