disable unused sersendf, enable %x in sersendf_P

triffid · Feb 12, 2011 · 84457cc · 84457cc
1 parent 7eb6feb
commit 84457cc
Showing 1 changed file with 62 additions and 62 deletions.
diff --git a/sersendf.c b/sersendf.c
@@ -8,66 +8,66 @@
 
 PGM_P	str_ox = "0x";
 
-void sersendf(char *format, ...) {
+// void sersendf(char *format, ...) {
-	va_list args;
+// 	va_list args;
-	va_start(args, format);
+// 	va_start(args, format);
-
+// 
-	uint16_t i = 0;
+// 	uint16_t i = 0;
-	uint8_t c, j = 0;
+// 	uint8_t c, j = 0;
-	while ((c = format[i++])) {
+// 	while ((c = format[i++])) {
-		if (j) {
+// 		if (j) {
-			switch(c) {
+// 			switch(c) {
-				case 'l':
+// 				case 'l':
-					j = 4;
+// 					j = 4;
-					break;
+// 					break;
-				case 'u':
+// 				case 'u':
-					if (j == 4)
+// 					if (j == 4)
-						serwrite_uint32(va_arg(args, uint32_t));
+// 						serwrite_uint32(va_arg(args, uint32_t));
-					else
+// 					else
-						serwrite_uint16(va_arg(args, uint16_t));
+// 						serwrite_uint16(va_arg(args, uint16_t));
-					j = 0;
+// 					j = 0;
-					break;
+// 					break;
-				case 'd':
+// 				case 'd':
-					if (j == 4)
+// 					if (j == 4)
-						serwrite_int32(va_arg(args, int32_t));
+// 						serwrite_int32(va_arg(args, int32_t));
-					else
+// 					else
-						serwrite_int16(va_arg(args, int16_t));
+// 						serwrite_int16(va_arg(args, int16_t));
-					j = 0;
+// 					j = 0;
-					break;
+// 					break;
-				case 'p':
+// 				case 'p':
-				case 'x':
+// 				case 'x':
-					serial_writestr_P(str_ox);
+// 					serial_writestr_P(str_ox);
-					if (j == 4)
+// 					if (j == 4)
-						serwrite_hex32(va_arg(args, uint32_t));
+// 						serwrite_hex32(va_arg(args, uint32_t));
-					else
+// 					else
-						serwrite_hex16(va_arg(args, uint16_t));
+// 						serwrite_hex16(va_arg(args, uint16_t));
-					j = 0;
+// 					j = 0;
-					break;
+// 					break;
-				case 'c':
+// 				case 'c':
-					serial_writechar(va_arg(args, uint16_t));
+// 					serial_writechar(va_arg(args, uint16_t));
-					j = 0;
+// 					j = 0;
-					break;
+// 					break;
-				case 's':
+// 				case 's':
-					serial_writestr(va_arg(args, uint8_t *));
+// 					serial_writestr(va_arg(args, uint8_t *));
-					j = 0;
+// 					j = 0;
-					break;
+// 					break;
-				default:
+// 				default:
-					serial_writechar(c);
+// 					serial_writechar(c);
-					j = 0;
+// 					j = 0;
-					break;
+// 					break;
-			}
+// 			}
-		}
+// 		}
-		else {
+// 		else {
-			if (c == '%') {
+// 			if (c == '%') {
-				j = 2;
+// 				j = 2;
-			}
+// 			}
-			else {
+// 			else {
-				serial_writechar(c);
+// 				serial_writechar(c);
-			}
+// 			}
-		}
+// 		}
-	}
+// 	}
-	va_end(args);
+// 	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);