|
@@ -27,98 +27,79 @@
|
|
|
|
|
|
#include <stdint.h>
|
|
#include <stdint.h>
|
|
#include <stdbool.h>
|
|
#include <stdbool.h>
|
|
-#include <avr/pgmspace.h>
|
|
|
|
-#include "xprintf.h"
|
|
|
|
#include "util.h"
|
|
#include "util.h"
|
|
|
|
|
|
|
|
|
|
-// this macro allows you to write print("some text") and
|
|
|
|
-// the string is automatically placed into flash memory :)
|
|
|
|
-// TODO: avoid collision with arduino/Print.h
|
|
|
|
-#ifndef __cplusplus
|
|
|
|
-#define print(s) print_P(PSTR(s))
|
|
|
|
-#endif
|
|
|
|
-#define println(s) print_P(PSTR(s "\n"))
|
|
|
|
|
|
|
|
-/* for old name */
|
|
|
|
-#define pdec(data) print_dec(data)
|
|
|
|
-#define pdec16(data) print_dec(data)
|
|
|
|
-#define phex(data) print_hex8(data)
|
|
|
|
-#define phex16(data) print_hex16(data)
|
|
|
|
-#define pbin(data) print_bin8(data)
|
|
|
|
-#define pbin16(data) print_bin16(data)
|
|
|
|
-#define pbin_reverse(data) print_bin_reverse8(data)
|
|
|
|
-#define pbin_reverse16(data) print_bin_reverse16(data)
|
|
|
|
|
|
|
|
-/* print value utility */
|
|
+#ifndef NO_PRINT
|
|
-#define print_val_dec(v) xprintf(#v ": %u\n", v)
|
|
|
|
-#define print_val_decs(v) xprintf(#v ": %d\n", v)
|
|
|
|
-#define print_val_hex8(v) xprintf(#v ": %X\n", v)
|
|
|
|
-#define print_val_hex16(v) xprintf(#v ": %02X\n", v)
|
|
|
|
-#define print_val_hex32(v) xprintf(#v ": %04lX\n", v)
|
|
|
|
-#define print_val_bin8(v) xprintf(#v ": %08b\n", v)
|
|
|
|
-#define print_val_bin16(v) xprintf(#v ": %016b\n", v)
|
|
|
|
-#define print_val_bin32(v) xprintf(#v ": %032lb\n", v)
|
|
|
|
-#define print_val_bin_reverse8(v) xprintf(#v ": %08b\n", bitrev(v))
|
|
|
|
-#define print_val_bin_reverse16(v) xprintf(#v ": %016b\n", bitrev16(v))
|
|
|
|
-#define print_val_bin_reverse32(v) xprintf(#v ": %032lb\n", bitrev32(v))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+#ifdef __AVR__
|
|
|
|
+
|
|
|
|
+#include "xprintf.h"
|
|
|
|
|
|
-#ifndef NO_PRINT
|
|
+
|
|
|
|
+// TODO: avoid collision with arduino/Print.h
|
|
|
|
+#ifndef __cplusplus
|
|
|
|
+#define print(s) xputs(PSTR(s))
|
|
|
|
+#endif
|
|
|
|
+#define println(s) xputs(PSTR(s "\n"))
|
|
|
|
|
|
#ifdef __cplusplus
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
extern "C" {
|
|
#endif
|
|
#endif
|
|
-
|
|
|
|
/* function pointer of sendchar to be used by print utility */
|
|
/* function pointer of sendchar to be used by print utility */
|
|
void print_set_sendchar(int8_t (*print_sendchar_func)(uint8_t));
|
|
void print_set_sendchar(int8_t (*print_sendchar_func)(uint8_t));
|
|
|
|
|
|
-/* print string stored in data memory(SRAM)
|
|
+#elif __arm__
|
|
- * print_S("hello world");
|
|
|
|
- * This consumes precious SRAM memory space for string.
|
|
|
|
- */
|
|
|
|
-void print_S(const char *s);
|
|
|
|
|
|
|
|
-void print_lf(void);
|
|
+#include "mbed.h"
|
|
-void print_crlf(void);
|
|
+Serial ser(UART_TX, UART_RX);
|
|
|
|
+#define xprintf ser.printf
|
|
|
|
+#define print(s) xprintf(s)
|
|
|
|
+#define println(s) xprintf(s "\n")
|
|
|
|
+/* TODO: to select output destinations: UART/USBSerial */
|
|
|
|
+#define print_set_sendchar(func)
|
|
|
|
|
|
|
|
+#endif /* __AVR__ */
|
|
|
|
|
|
-/* print string stored in program memory(FLASH)
|
|
|
|
- * print_P(PSTR("hello world");
|
|
|
|
- * This consumes relatively abundant FLASH memory area not SRAM.
|
|
|
|
- */
|
|
|
|
-#define print_P(s) xputs(s)
|
|
|
|
|
|
|
|
/* decimal */
|
|
/* decimal */
|
|
-#define print_dec(i) xprintf("%u", i)
|
|
+#define print_dec(i) xprintf("%u", i)
|
|
-#define print_decs(i) xprintf("%d", i)
|
|
+#define print_decs(i) xprintf("%d", i)
|
|
-
|
|
|
|
/* hex */
|
|
/* hex */
|
|
-#define print_hex4(i) xprintf("%X", i)
|
|
+#define print_hex4(i) xprintf("%X", i)
|
|
-#define print_hex8(i) xprintf("%02X", i)
|
|
+#define print_hex8(i) xprintf("%02X", i)
|
|
-#define print_hex16(i) xprintf("%04X", i)
|
|
+#define print_hex16(i) xprintf("%04X", i)
|
|
-#define print_hex32(i) xprintf("%08lX", i)
|
|
+#define print_hex32(i) xprintf("%08lX", i)
|
|
-
|
|
|
|
/* binary */
|
|
/* binary */
|
|
-#define print_bin4(i) xprintf("%04b", i)
|
|
+#define print_bin4(i) xprintf("%04b", i)
|
|
-#define print_bin8(i) xprintf("%08b", i)
|
|
+#define print_bin8(i) xprintf("%08b", i)
|
|
-#define print_bin16(i) xprintf("%016b", i)
|
|
+#define print_bin16(i) xprintf("%016b", i)
|
|
-#define print_bin32(i) xprintf("%032lb", i)
|
|
+#define print_bin32(i) xprintf("%032lb", i)
|
|
-
|
|
+#define print_bin_reverse8(i) xprintf("%08b", bitrev(i))
|
|
-#define print_bin_reverse8(i) xprintf("%08b", bitrev(i))
|
|
+#define print_bin_reverse16(i) xprintf("%016b", bitrev16(i))
|
|
-#define print_bin_reverse16(i) xprintf("%016b", bitrev16(i))
|
|
+#define print_bin_reverse32(i) xprintf("%032lb", bitrev32(i))
|
|
-#define print_bin_reverse32(i) xprintf("%032lb", bitrev32(i))
|
|
+/* print value utility */
|
|
-
|
|
+#define print_val_dec(v) xprintf(#v ": %u\n", v)
|
|
-#ifdef __cplusplus
|
|
+#define print_val_decs(v) xprintf(#v ": %d\n", v)
|
|
-}
|
|
+#define print_val_hex8(v) xprintf(#v ": %X\n", v)
|
|
-#endif
|
|
+#define print_val_hex16(v) xprintf(#v ": %02X\n", v)
|
|
-
|
|
+#define print_val_hex32(v) xprintf(#v ": %04lX\n", v)
|
|
-#else
|
|
+#define print_val_bin8(v) xprintf(#v ": %08b\n", v)
|
|
-
|
|
+#define print_val_bin16(v) xprintf(#v ": %016b\n", v)
|
|
|
|
+#define print_val_bin32(v) xprintf(#v ": %032lb\n", v)
|
|
|
|
+#define print_val_bin_reverse8(v) xprintf(#v ": %08b\n", bitrev(v))
|
|
|
|
+#define print_val_bin_reverse16(v) xprintf(#v ": %016b\n", bitrev16(v))
|
|
|
|
+#define print_val_bin_reverse32(v) xprintf(#v ": %032lb\n", bitrev32(v))
|
|
|
|
+
|
|
|
|
+#else /* NO_PRINT */
|
|
|
|
+
|
|
|
|
+#define xprintf
|
|
|
|
+#define print
|
|
|
|
+#define println
|
|
#define print_set_sendchar(func)
|
|
#define print_set_sendchar(func)
|
|
-#define print_S(s)
|
|
|
|
-#define print_P(s)
|
|
|
|
#define print_dec(data)
|
|
#define print_dec(data)
|
|
#define print_decs(data)
|
|
#define print_decs(data)
|
|
#define print_hex4(data)
|
|
#define print_hex4(data)
|
|
@@ -132,8 +113,30 @@ void print_crlf(void);
|
|
#define print_bin_reverse8(data)
|
|
#define print_bin_reverse8(data)
|
|
#define print_bin_reverse16(data)
|
|
#define print_bin_reverse16(data)
|
|
#define print_bin_reverse32(data)
|
|
#define print_bin_reverse32(data)
|
|
-
|
|
+#define print_val_dec(v)
|
|
-#endif
|
|
+#define print_val_decs(v)
|
|
|
|
+#define print_val_hex8(v)
|
|
|
|
+#define print_val_hex16(v)
|
|
|
|
+#define print_val_hex32(v)
|
|
|
|
+#define print_val_bin8(v)
|
|
|
|
+#define print_val_bin16(v)
|
|
|
|
+#define print_val_bin32(v)
|
|
|
|
+#define print_val_bin_reverse8(v)
|
|
|
|
+#define print_val_bin_reverse16(v)
|
|
|
|
+#define print_val_bin_reverse32(v)
|
|
|
|
+
|
|
|
|
+#endif /* NO_PRINT */
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+/* Backward compatiblitly for old name */
|
|
|
|
+#define pdec(data) print_dec(data)
|
|
|
|
+#define pdec16(data) print_dec(data)
|
|
|
|
+#define phex(data) print_hex8(data)
|
|
|
|
+#define phex16(data) print_hex16(data)
|
|
|
|
+#define pbin(data) print_bin8(data)
|
|
|
|
+#define pbin16(data) print_bin16(data)
|
|
|
|
+#define pbin_reverse(data) print_bin_reverse8(data)
|
|
|
|
+#define pbin_reverse16(data) print_bin_reverse16(data)
|
|
|
|
|
|
|
|
|
|
#endif
|
|
#endif
|