diff options
| author | QMK Bot <hello@qmk.fm> | 2021-03-25 11:34:28 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-03-25 11:34:28 +0000 |
| commit | 8086837f6938f6efa8877033aee5551da90e9e5d (patch) | |
| tree | 8e2c510c31607c18d6a351f971136adbb67b6ffa /tmk_core/common | |
| parent | ff41c22fdccd30cdba44ba840d68261f74f45135 (diff) | |
| parent | 1bb6d8de6fa5063b21bc34549e1cf552e60d90ba (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core/common')
| -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 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 |