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

Copter: removed extra features of copter telemetry merge

Browse Source
This commit is contained in:
Andrew Tridgell 2013-11-26 10:21:03 +11:00 committed by Randy Mackay
parent bac572fe17
commit 3920382150
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ArduCopter/GCS_Mavlink.pde
View File

@ -981,6 +981,8 @@ GCS_MAVLINK::data_stream_send(void)
if (stream_trigger(STREAM_PARAMS)) { if (stream_trigger(STREAM_PARAMS)) {
send_message(MSG_NEXT_PARAM); send_message(MSG_NEXT_PARAM);
} }
// don't send anything else at the same time as parameters
return;
} }
if (gcs_out_of_time) return; if (gcs_out_of_time) return;
@ -2198,9 +2200,6 @@ static void gcs_send_text_P(gcs_severity severity, const prog_char_t *str)
gcs[i].send_text_P(severity, str); gcs[i].send_text_P(severity, str);
} }
} }
#if LOGGING_ENABLED == ENABLED
DataFlash.Log_Write_Message_P(str);
#endif
} }
/* /*
@ -2216,9 +2215,6 @@ void gcs_send_text_fmt(const prog_char_t *fmt, ...)
hal.util->vsnprintf_P((char *)gcs[0].pending_status.text, hal.util->vsnprintf_P((char *)gcs[0].pending_status.text,
sizeof(gcs[0].pending_status.text), fmt, arg_list); sizeof(gcs[0].pending_status.text), fmt, arg_list);
va_end(arg_list); va_end(arg_list);
#if LOGGING_ENABLED == ENABLED
DataFlash.Log_Write_Message(gcs[0].pending_status.text);
#endif
mavlink_send_message(MAVLINK_COMM_0, MSG_STATUSTEXT, 0); mavlink_send_message(MAVLINK_COMM_0, MSG_STATUSTEXT, 0);
for (uint8_t i=1; i<num_gcs; i++) { for (uint8_t i=1; i<num_gcs; i++) {
if (gcs[i].initialised) { if (gcs[i].initialised) {