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

Rover/Copter/Plane: change from vsnprintf to vsnprintf_P

Browse Source
This commit is contained in:
Pat Hickey 2012-12-18 17:37:56 -08:00 committed by Andrew Tridgell
parent edb076a6c5
commit 2ad4fed8cd
3 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
APMrover2/GCS_Mavlink.pde
View File

@ -1892,18 +1892,11 @@ static void gcs_send_text_P(gcs_severity severity, const prog_char_t *str)
*/ */
void gcs_send_text_fmt(const prog_char_t *fmt, ...) void gcs_send_text_fmt(const prog_char_t *fmt, ...)
{ {
char fmtstr[40];
va_list arg_list; va_list arg_list;
uint8_t i;
for (i=0; i<sizeof(fmtstr)-1; i++) {
fmtstr[i] = pgm_read_byte((const prog_char *)(fmt++));
if (fmtstr[i] == 0) break;
}
fmtstr[i] = 0;
gcs0.pending_status.severity = (uint8_t)SEVERITY_LOW; gcs0.pending_status.severity = (uint8_t)SEVERITY_LOW;
va_start(arg_list, fmt); va_start(arg_list, fmt);
hal.util->vsnprintf((char *)gcs0.pending_status.text, hal.util->vsnprintf_P((char *)gcs0.pending_status.text,
sizeof(gcs0.pending_status.text), fmtstr, arg_list); sizeof(gcs0.pending_status.text), fmt, arg_list);
va_end(arg_list); va_end(arg_list);
gcs3.pending_status = gcs0.pending_status; gcs3.pending_status = gcs0.pending_status;
mavlink_send_message(MAVLINK_COMM_0, MSG_STATUSTEXT, 0); mavlink_send_message(MAVLINK_COMM_0, MSG_STATUSTEXT, 0);

11
ArduCopter/GCS_Mavlink.pde
View File

@ -2117,18 +2117,11 @@ 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, ...) static void gcs_send_text_fmt(const prog_char_t *fmt, ...)
{ {
char fmtstr[40];
va_list arg_list; va_list arg_list;
uint8_t i;
for (i=0; i<sizeof(fmtstr)-1; i++) {
fmtstr[i] = pgm_read_byte((const prog_char *)(fmt++));
if (fmtstr[i] == 0) break;
}
fmtstr[i] = 0;
pending_status.severity = (uint8_t)SEVERITY_LOW; pending_status.severity = (uint8_t)SEVERITY_LOW;
va_start(arg_list, fmt); va_start(arg_list, fmt);
hal.util->vsnprintf((char *)pending_status.text, hal.util->vsnprintf_P((char *)pending_status.text,
sizeof(pending_status.text), fmtstr, arg_list); sizeof(pending_status.text), fmt, arg_list);
va_end(arg_list); va_end(arg_list);
mavlink_send_message(MAVLINK_COMM_0, MSG_STATUSTEXT, 0); mavlink_send_message(MAVLINK_COMM_0, MSG_STATUSTEXT, 0);
if (gcs3.initialised) { if (gcs3.initialised) {

11
ArduPlane/GCS_Mavlink.pde
View File

@ -2071,18 +2071,11 @@ static void gcs_send_text_P(gcs_severity severity, const prog_char_t *str)
*/ */
void gcs_send_text_fmt(const prog_char_t *fmt, ...) void gcs_send_text_fmt(const prog_char_t *fmt, ...)
{ {
char fmtstr[40];
va_list arg_list; va_list arg_list;
uint8_t i;
for (i=0; i<sizeof(fmtstr)-1; i++) {
fmtstr[i] = pgm_read_byte((const prog_char *)(fmt++));
if (fmtstr[i] == 0) break;
}
fmtstr[i] = 0;
gcs0.pending_status.severity = (uint8_t)SEVERITY_LOW; gcs0.pending_status.severity = (uint8_t)SEVERITY_LOW;
va_start(arg_list, fmt); va_start(arg_list, fmt);
hal.util->vsnprintf((char *)gcs0.pending_status.text, hal.util->vsnprintf_P((char *)gcs0.pending_status.text,
sizeof(gcs0.pending_status.text), fmtstr, arg_list); sizeof(gcs0.pending_status.text), fmt, arg_list);
va_end(arg_list); va_end(arg_list);
gcs3.pending_status = gcs0.pending_status; gcs3.pending_status = gcs0.pending_status;
mavlink_send_message(MAVLINK_COMM_0, MSG_STATUSTEXT, 0); mavlink_send_message(MAVLINK_COMM_0, MSG_STATUSTEXT, 0);