josh
/
Teacup_Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

disable unused sersendf, enable %x in sersendf_P

This commit is contained in:
Michael Moon 2011-02-05 18:36:15 +11:00
parent 7eb6febf8e
commit 84457ccc4b
1 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
sersendf.c
View File

@ -8,66 +8,66 @@
PGM_P str_ox = "0x";
void sersendf(char *format, ...) {
va_list args;
va_start(args, format);
uint16_t i = 0;
uint8_t c, j = 0;
while ((c = format[i++])) {
if (j) {
switch(c) {
case 'l':
j = 4;
break;
case 'u':
if (j == 4)
serwrite_uint32(va_arg(args, uint32_t));
else
serwrite_uint16(va_arg(args, uint16_t));
j = 0;
break;
case 'd':
if (j == 4)
serwrite_int32(va_arg(args, int32_t));
else
serwrite_int16(va_arg(args, int16_t));
j = 0;
break;
case 'p':
case 'x':
serial_writestr_P(str_ox);
if (j == 4)
serwrite_hex32(va_arg(args, uint32_t));
else
serwrite_hex16(va_arg(args, uint16_t));
j = 0;
break;
case 'c':
serial_writechar(va_arg(args, uint16_t));
j = 0;
break;
case 's':
serial_writestr(va_arg(args, uint8_t *));
j = 0;
break;
default:
serial_writechar(c);
j = 0;
break;
}
}
else {
if (c == '%') {
j = 2;
}
else {
serial_writechar(c);
}
}
}
va_end(args);
}
// void sersendf(char *format, ...) {
// va_list args;
// va_start(args, format);
//
// uint16_t i = 0;
// uint8_t c, j = 0;
// while ((c = format[i++])) {
// if (j) {
// switch(c) {
// case 'l':
// j = 4;
// break;
// case 'u':
// if (j == 4)
// serwrite_uint32(va_arg(args, uint32_t));
// else
// serwrite_uint16(va_arg(args, uint16_t));
// j = 0;
// break;
// case 'd':
// if (j == 4)
// serwrite_int32(va_arg(args, int32_t));
// else
// serwrite_int16(va_arg(args, int16_t));
// j = 0;
// break;
// case 'p':
// case 'x':
// serial_writestr_P(str_ox);
// if (j == 4)
// serwrite_hex32(va_arg(args, uint32_t));
// else
// serwrite_hex16(va_arg(args, uint16_t));
// j = 0;
// break;
// case 'c':
// serial_writechar(va_arg(args, uint16_t));
// j = 0;
// break;
// case 's':
// serial_writestr(va_arg(args, uint8_t *));
// j = 0;
// break;
// default:
// serial_writechar(c);
// j = 0;
// break;
// }
// }
// else {
// if (c == '%') {
// j = 2;
// }
// else {
// serial_writechar(c);
// }
// }
// }
// va_end(args);
// }
void sersendf_P(PGM_P format, ...) {
va_list args;
@ -102,7 +102,7 @@ void sersendf_P(PGM_P format, ...) {
serial_writechar(va_arg(args, uint16_t));
j = 0;
break;
/* case 'x':
case 'x':
serial_writestr_P(str_ox);
if (j == 4)
serwrite_hex32(va_arg(args, uint32_t));
@ -112,7 +112,7 @@ void sersendf_P(PGM_P format, ...) {
serwrite_hex16(va_arg(args, uint16_t));
j = 0;
break;
case 'p':
/* case 'p':
serwrite_hex16(va_arg(args, uint16_t));*/
default:
serial_writechar(c);