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

ArduCopter, ArduPlane: rename ap variable in GCS_Mavlink.pde to resolve compiler warning re shadowing of variable 'ap'

Browse Source 
Changed ArduPlane to keep function consistent with ArduCopter
This commit is contained in:
rmackay9 2012-11-12 13:30:04 +09:00
parent dcd98eee78
commit cdfd3f9ccc
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ArduCopter/GCS_Mavlink.pde
View File

@ -2109,7 +2109,7 @@ static void gcs_send_text_P(gcs_severity severity, const prog_char_t *str)
static void gcs_send_text_fmt(const prog_char_t *fmt, ...)
{
char fmtstr[40];
va_list ap;
va_list arg_list;
uint8_t i;
for (i=0; i<sizeof(fmtstr)-1; i++) {
fmtstr[i] = pgm_read_byte((const prog_char *)(fmt++));
@ -2117,9 +2117,9 @@ static void gcs_send_text_fmt(const prog_char_t *fmt, ...)
}
fmtstr[i] = 0;
pending_status.severity = (uint8_t)SEVERITY_LOW;
va_start(ap, fmt);
vsnprintf((char *)pending_status.text, sizeof(pending_status.text), fmtstr, ap);
va_end(ap);
va_start(arg_list, fmt);
vsnprintf((char *)pending_status.text, sizeof(pending_status.text), fmtstr, arg_list);
va_end(arg_list);
mavlink_send_message(MAVLINK_COMM_0, MSG_STATUSTEXT, 0);
if (gcs3.initialised) {
mavlink_send_message(MAVLINK_COMM_1, MSG_STATUSTEXT, 0);

8
ArduPlane/GCS_Mavlink.pde
View File

@ -2129,7 +2129,7 @@ static void gcs_send_text_P(gcs_severity severity, const prog_char_t *str)
void gcs_send_text_fmt(const prog_char_t *fmt, ...)
{
char fmtstr[40];
va_list ap;
va_list arg_list;
uint8_t i;
for (i=0; i<sizeof(fmtstr)-1; i++) {
fmtstr[i] = pgm_read_byte((const prog_char *)(fmt++));
@ -2137,9 +2137,9 @@ void gcs_send_text_fmt(const prog_char_t *fmt, ...)
}
fmtstr[i] = 0;
gcs0.pending_status.severity = (uint8_t)SEVERITY_LOW;
va_start(ap, fmt);
vsnprintf((char *)gcs0.pending_status.text, sizeof(gcs0.pending_status.text), fmtstr, ap);
va_end(ap);
va_start(arg_list, fmt);
vsnprintf((char *)gcs0.pending_status.text, sizeof(gcs0.pending_status.text), fmtstr, arg_list);
va_end(arg_list);
gcs3.pending_status = gcs0.pending_status;
mavlink_send_message(MAVLINK_COMM_0, MSG_STATUSTEXT, 0);
if (gcs3.initialised) {