aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Plane: eliminate gcs_send_mission_item_reached wrapper

Browse Source
This commit is contained in:
Peter Barker 2017-07-08 11:55:12 +10:00 committed by Francisco Ferreira
parent 358555446b
commit 250f315678
4 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ArduPlane/GCS_Mavlink.cpp
View File

@ -2134,14 +2134,6 @@ void Plane::mavlink_delay_cb()
in_mavlink_delay = false; 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 Plane::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 * send data streams in the given rate range on both links
*/ */

1
ArduPlane/Plane.h
View File

@ -822,7 +822,6 @@ private:
void send_aoa_ssa(mavlink_channel_t chan); void send_aoa_ssa(mavlink_channel_t chan);
bool telemetry_delayed(mavlink_channel_t chan); bool telemetry_delayed(mavlink_channel_t chan);
void gcs_send_mission_item_reached_message(uint16_t mission_index);
void gcs_data_stream_send(void); void gcs_data_stream_send(void);
void gcs_update(void); void gcs_update(void);
void gcs_send_airspeed_calibration(const Vector3f &vg); void gcs_send_airspeed_calibration(const Vector3f &vg);

2
ArduPlane/commands_logic.cpp
View File

@ -1004,7 +1004,7 @@ bool Plane::verify_command_callback(const AP_Mission::Mission_Command& cmd)
// send message to GCS // send message to GCS
if (cmd_complete) { if (cmd_complete) {
gcs_send_mission_item_reached_message(cmd.index); gcs().send_mission_item_reached_message(cmd.index);
} }
return cmd_complete; return cmd_complete;

2
ArduPlane/navigation.cpp
View File

@ -197,7 +197,7 @@ void Plane::update_loiter(uint16_t radius)
loiter.start_time_ms = millis(); loiter.start_time_ms = millis();
if (control_mode == GUIDED || control_mode == AVOID_ADSB) { if (control_mode == GUIDED || control_mode == AVOID_ADSB) {
// starting a loiter in GUIDED means we just reached the target point // starting a loiter in GUIDED means we just reached the target point
gcs_send_mission_item_reached_message(0); gcs().send_mission_item_reached_message(0);
} }
if (quadplane.guided_mode_enabled()) { if (quadplane.guided_mode_enabled()) {
quadplane.guided_start(); quadplane.guided_start();