diff options
| author | Joel Challis <git@zvecr.com> | 2021-03-25 11:33:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-25 22:33:53 +1100 |
| commit | 1bb6d8de6fa5063b21bc34549e1cf552e60d90ba (patch) | |
| tree | d882751af2d49bc7a165380e87595a653bcdb71c /tmk_core | |
| parent | a888057453db7a854549ec0d13f638392ffbcca8 (diff) | |
| download | qmk_firmware-1bb6d8de6fa5063b21bc34549e1cf552e60d90ba.tar.gz qmk_firmware-1bb6d8de6fa5063b21bc34549e1cf552e60d90ba.zip | |
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>
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common/arm_atsam/_print.h | 10 | ||||
| -rw-r--r-- | tmk_core/common/avr/_print.h | 6 |
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 a774f5d8d..04320ee38 100644 --- a/tmk_core/common/arm_atsam/_print.h +++ b/tmk_core/common/arm_atsam/_print.h | |||
| @@ -27,8 +27,8 @@ | |||
| 27 | 27 | ||
| 28 | // Create user & normal print defines | 28 | // Create user & normal print defines |
| 29 | #define xprintf(fmt, ...) __xprintf(fmt, ##__VA_ARGS__) | 29 | #define xprintf(fmt, ...) __xprintf(fmt, ##__VA_ARGS__) |
| 30 | #define print(s) xprintf(s) | 30 | #define print(s) __xprintf(s) |
| 31 | #define println(s) xprintf(s "\r\n") | 31 | #define println(s) __xprintf(s "\r\n") |
| 32 | #define uprint(s) print(s) | 32 | #define uprint(s) __xprintf(s) |
| 33 | #define uprintln(s) println(s) | 33 | #define uprintln(s) __xprintf(s "\r\n") |
| 34 | #define uprintf(fmt, ...) xprintf(fmt, ##__VA_ARGS__) | 34 | #define uprintf(fmt, ...) __xprintf(fmt, ##__VA_ARGS__) |
diff --git a/tmk_core/common/avr/_print.h b/tmk_core/common/avr/_print.h index f9b79bdf8..5c1fdd26d 100644 --- a/tmk_core/common/avr/_print.h +++ b/tmk_core/common/avr/_print.h | |||
| @@ -28,6 +28,6 @@ | |||
| 28 | // Create user & normal print defines | 28 | // Create user & normal print defines |
| 29 | #define print(s) xputs(PSTR(s)) | 29 | #define print(s) xputs(PSTR(s)) |
| 30 | #define println(s) xputs(PSTR(s "\r\n")) | 30 | #define println(s) xputs(PSTR(s "\r\n")) |
| 31 | #define uprint(s) print(s) | 31 | #define uprint(s) xputs(PSTR(s)) |
| 32 | #define uprintln(s) println(s) | 32 | #define uprintln(s) xputs(PSTR(s "\r\n")) |
| 33 | #define uprintf(fmt, ...) xprintf(fmt, ##__VA_ARGS__) \ No newline at end of file | 33 | #define uprintf(fmt, ...) __xprintf(PSTR(fmt), ##__VA_ARGS__) \ No newline at end of file |