Quellcode durchsuchen

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>
Joel Challis vor 4 Jahren
Ursprung
Commit
1bb6d8de6f
2 geänderte Dateien mit 8 neuen und 8 gelöschten Zeilen
  1. 5 5
      tmk_core/common/arm_atsam/_print.h
  2. 3 3
      tmk_core/common/avr/_print.h

+ 5 - 5
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__)

+ 3 - 3
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__)