diff options
| author | Joel Challis <git@zvecr.com> | 2020-05-04 07:19:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-03 23:19:51 -0700 |
| commit | e17b55e33ad5b3dcefcf7b828ac99aeb2daeeae2 (patch) | |
| tree | e6430a88e4ce4e73783f2a2f4fd4939885b1e402 /tmk_core/common/print.h | |
| parent | f31bf1b2025ece2d61cec10293cbd4e18b537eeb (diff) | |
Fix conflicting types for 'tfp_printf' (#8269)
* Refactor to use mpaland/printf
* trim firmware size
* remove keymap changes
* run clang format
* Fixup after rebase
* fix up git-submodule command for printf
Diffstat (limited to 'tmk_core/common/print.h')
| -rw-r--r-- | tmk_core/common/print.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tmk_core/common/print.h b/tmk_core/common/print.h index 04ca558109..1c77236212 100644 --- a/tmk_core/common/print.h +++ b/tmk_core/common/print.h @@ -72,9 +72,7 @@ extern "C" # elif defined(PROTOCOL_CHIBIOS) /* PROTOCOL_CHIBIOS */ -# ifndef TERMINAL_ENABLE -# include "chibios/printf.h" -# endif +# include "printf.h" // lib/printf/printf.h # ifdef USER_PRINT /* USER_PRINT */ @@ -89,7 +87,6 @@ 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") |