summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2021-03-25 11:33:53 +0000
committerGitHub <noreply@github.com>2021-03-25 22:33:53 +1100
commit1bb6d8de6fa5063b21bc34549e1cf552e60d90ba (patch)
treed882751af2d49bc7a165380e87595a653bcdb71c
parenta888057453db7a854549ec0d13f638392ffbcca8 (diff)
Fix USER_PRINT on avr/atsam (#12269)
* Fix USER_PRINT on avr/atsam * Update tmk_core/common/arm_atsam/_print.h Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
-rw-r--r--tmk_core/common/arm_atsam/_print.h10
-rw-r--r--tmk_core/common/avr/_print.h6
2 files changed, 8 insertions, 8 deletions
diff --git a/tmk_core/common/arm_atsam/_print.h b/tmk_core/common/arm_atsam/_print.h
index a774f5d8d2..04320ee38b 100644
--- 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__)
diff --git a/tmk_core/common/avr/_print.h b/tmk_core/common/avr/_print.h
index f9b79bdf85..5c1fdd26d8 100644
--- 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__) \ No newline at end of file
+#define uprint(s) xputs(PSTR(s))
+#define uprintln(s) xputs(PSTR(s "\r\n"))
+#define uprintf(fmt, ...) __xprintf(PSTR(fmt), ##__VA_ARGS__) \ No newline at end of file