Merge remote-tracking branch 'origin/master' into develop

5 years ago · 8086837f69
parent ff41c22fdc 1bb6d8de6f
commit 8086837f69
2 changed files with 8 additions and 8 deletions
--- a/tmk_core/common/arm_atsam/_print.h
+++ b/tmk_core/common/arm_atsam/_print.h
@ -27,8 +27,8 @@

 // Create user & normal print defines
 #define xprintf(fmt, ...) __xprintf(fmt, ##__VA_ARGS__)
-#define print(s) xprintf(s)
-#define println(s) xprintf(s "\r\n")
-#define uprint(s) print(s)
-#define uprintln(s) println(s)
-#define uprintf(fmt, ...) xprintf(fmt, ##__VA_ARGS__)
+#define print(s) __xprintf(s)
+#define println(s) __xprintf(s "\r\n")
+#define uprint(s) __xprintf(s)
+#define uprintln(s) __xprintf(s "\r\n")
+#define uprintf(fmt, ...) __xprintf(fmt, ##__VA_ARGS__)
--- a/tmk_core/common/avr/_print.h
+++ b/tmk_core/common/avr/_print.h
@ -28,6 +28,6 @@
 // Create user & normal print defines
 #define print(s) xputs(PSTR(s))
 #define println(s) xputs(PSTR(s "\r\n"))
-#define uprint(s) print(s)
-#define uprintln(s) println(s)
-#define uprintf(fmt, ...) xprintf(fmt, ##__VA_ARGS__)
+#define uprint(s) xputs(PSTR(s))
+#define uprintln(s) xputs(PSTR(s "\r\n"))
+#define uprintf(fmt, ...) __xprintf(PSTR(fmt), ##__VA_ARGS__)