From 9f73d2f9d8a798adcc9a3265c8aaaba8d8a3d5d2 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Sat, 8 Jul 2017 12:03:58 +1000 Subject: [PATCH] Sub: eliminate gcs_send_mission_item_reached wrapper --- ArduSub/GCS_Mavlink.cpp | 8 -------- ArduSub/Sub.h | 1 - ArduSub/commands_logic.cpp | 2 +- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/ArduSub/GCS_Mavlink.cpp b/ArduSub/GCS_Mavlink.cpp index caf52c3603..15adc79375 100644 --- a/ArduSub/GCS_Mavlink.cpp +++ b/ArduSub/GCS_Mavlink.cpp @@ -1833,14 +1833,6 @@ void Sub::mavlink_delay_cb() in_mavlink_delay = false; } -/* - * send a mission item reached message and load the index before the send attempt in case it may get delayed - */ -void Sub::gcs_send_mission_item_reached_message(uint16_t mission_index) -{ - gcs().send_mission_item_reached_message(mission_index); -} - /* * send data streams in the given rate range on both links */ diff --git a/ArduSub/Sub.h b/ArduSub/Sub.h index 3b63175466..553132b48c 100644 --- a/ArduSub/Sub.h +++ b/ArduSub/Sub.h @@ -493,7 +493,6 @@ private: #endif void send_temperature(mavlink_channel_t chan); void send_pid_tuning(mavlink_channel_t chan); - void gcs_send_mission_item_reached_message(uint16_t mission_index); void gcs_data_stream_send(void); void gcs_check_input(void); void do_erase_logs(void); diff --git a/ArduSub/commands_logic.cpp b/ArduSub/commands_logic.cpp index f023135052..98886af387 100644 --- a/ArduSub/commands_logic.cpp +++ b/ArduSub/commands_logic.cpp @@ -172,7 +172,7 @@ bool Sub::verify_command_callback(const AP_Mission::Mission_Command& cmd) // send message to GCS if (cmd_complete) { - gcs_send_mission_item_reached_message(cmd.index); + gcs().send_mission_item_reached_message(cmd.index); } return cmd_complete;