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

GCS_MAVLink: move sending of camera_feedback up

Browse Source
This commit is contained in:
Peter Barker 2017-08-04 18:22:39 +10:00 committed by Francisco Ferreira
parent 8692bb4619
commit d1a9128118
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/GCS_MAVLink/GCS.h
View File

@ -293,6 +293,7 @@ protected:
// message sending functions:
bool try_send_compass_message(enum ap_message id);
bool try_send_mission_message(enum ap_message id);
bool try_send_camera_message(enum ap_message id);
void send_hwstatus();
private:

26
libraries/GCS_MAVLink/GCS_Common.cpp
View File

@ -2113,6 +2113,27 @@ void GCS_MAVLINK::send_hwstatus()
0);
}
bool GCS_MAVLINK::try_send_camera_message(const enum ap_message id)
{
AP_Camera *camera = get_camera();
if (camera == nullptr) {
return true;
}
bool ret = true;
switch(id) {
case MSG_CAMERA_FEEDBACK:
CHECK_PAYLOAD_SIZE(CAMERA_FEEDBACK);
camera->send_feedback(chan);
ret = true;
break;
default:
ret = true;
break;
}
return ret;
}
bool GCS_MAVLINK::try_send_message(const enum ap_message id)
{
if (telemetry_delayed()) {
@ -2155,6 +2176,11 @@ bool GCS_MAVLINK::try_send_message(const enum ap_message id)
ret = true;
break;
case MSG_CAMERA_FEEDBACK:
ret = try_send_camera_message(id);
break;
default:
// try_send_message must always at some stage return true for
// a message, or we will attempt to infinitely retry the