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) | |
| download | qmk_firmware-e17b55e33ad5b3dcefcf7b828ac99aeb2daeeae2.tar.gz qmk_firmware-e17b55e33ad5b3dcefcf7b828ac99aeb2daeeae2.zip | |
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 04ca55810..1c7723621 100644 --- a/tmk_core/common/print.h +++ b/tmk_core/common/print.h | |||
| @@ -72,9 +72,7 @@ extern "C" | |||
| 72 | 72 | ||
| 73 | # elif defined(PROTOCOL_CHIBIOS) /* PROTOCOL_CHIBIOS */ | 73 | # elif defined(PROTOCOL_CHIBIOS) /* PROTOCOL_CHIBIOS */ |
| 74 | 74 | ||
| 75 | # ifndef TERMINAL_ENABLE | 75 | # include "printf.h" // lib/printf/printf.h |
| 76 | # include "chibios/printf.h" | ||
| 77 | # endif | ||
| 78 | 76 | ||
| 79 | # ifdef USER_PRINT /* USER_PRINT */ | 77 | # ifdef USER_PRINT /* USER_PRINT */ |
| 80 | 78 | ||
| @@ -89,7 +87,6 @@ extern "C" | |||
| 89 | # define uprintf printf | 87 | # define uprintf printf |
| 90 | 88 | ||
| 91 | # else /* NORMAL PRINT */ | 89 | # else /* NORMAL PRINT */ |
| 92 | |||
| 93 | // Create user & normal print defines | 90 | // Create user & normal print defines |
| 94 | # define print(s) printf(s) | 91 | # define print(s) printf(s) |
| 95 | # define println(s) printf(s "\r\n") | 92 | # define println(s) printf(s "\r\n") |