diff options
| author |  skullY <skullydazed@gmail.com> | 2020-05-04 09:25:44 -0700 |
|---|---|---|
| committer | skullY <skullydazed@gmail.com> | 2020-05-04 09:25:44 -0700 |
| commit | 6f30b402a285ddecce9b6f5b002a649f775225d2 (patch) | |
| tree | 5a25c7334d931a56d9fbfad80b6284cda7e38950 /tmk_core/common/print.h | |
| parent | 1ff526dac0e73ea8cce522d0106631e3a748802c (diff) | |
| download | qmk_firmware-6f30b402a285ddecce9b6f5b002a649f775225d2.tar.gz | |
Revert "Fix conflicting types for 'tfp_printf' (#8269)"
This reverts commit e17b55e33ad5b3dcefcf7b828ac99aeb2daeeae2.
Diffstat (limited to 'tmk_core/common/print.h')
| -rw-r--r-- | tmk_core/common/print.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tmk_core/common/print.h b/tmk_core/common/print.h index 1c7723621..04ca55810 100644 --- a/tmk_core/common/print.h +++ b/tmk_core/common/print.h @@ -72,7 +72,9 @@ extern "C" # elif defined(PROTOCOL_CHIBIOS) /* PROTOCOL_CHIBIOS */ -# include "printf.h" // lib/printf/printf.h +# ifndef TERMINAL_ENABLE +# include "chibios/printf.h" +# endif # ifdef USER_PRINT /* USER_PRINT */ @@ -87,6 +89,7 @@ extern "C" # define uprintf printf # else /* NORMAL PRINT */ + // Create user & normal print defines # define print(s) printf(s) # define println(s) printf(s "\r\n") |