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/protocol | |
| parent | f31bf1b2025ece2d61cec10293cbd4e18b537eeb (diff) | |
| download | firmware-e17b55e33ad5b3dcefcf7b828ac99aeb2daeeae2.tar.gz firmware-e17b55e33ad5b3dcefcf7b828ac99aeb2daeeae2.tar.bz2 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/protocol')
| -rw-r--r-- | tmk_core/protocol/chibios/main.c | 3 | ||||
| -rw-r--r-- | tmk_core/protocol/chibios/usb_main.c | 5 | ||||
| -rw-r--r-- | tmk_core/protocol/chibios/usb_main.h | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/tmk_core/protocol/chibios/main.c b/tmk_core/protocol/chibios/main.c index 61665eb6f..7d32c16ed 100644 --- a/tmk_core/protocol/chibios/main.c +++ b/tmk_core/protocol/chibios/main.c @@ -158,9 +158,6 @@ int main(void) { /* Init USB */ init_usb_driver(&USB_DRIVER); - /* init printf */ - init_printf(NULL, sendchar_pf); - #ifdef MIDI_ENABLE setup_midi(); #endif diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c index ecc83d9ec..65bd291be 100644 --- a/tmk_core/protocol/chibios/usb_main.c +++ b/tmk_core/protocol/chibios/usb_main.c @@ -796,9 +796,8 @@ int8_t sendchar(uint8_t c) { } #endif /* CONSOLE_ENABLE */ -void sendchar_pf(void *p, char c) { - (void)p; - sendchar((uint8_t)c); +void _putchar(char character) { + sendchar(character); } #ifdef RAW_ENABLE diff --git a/tmk_core/protocol/chibios/usb_main.h b/tmk_core/protocol/chibios/usb_main.h index 17041b4f2..94baf9b35 100644 --- a/tmk_core/protocol/chibios/usb_main.h +++ b/tmk_core/protocol/chibios/usb_main.h @@ -87,6 +87,4 @@ void console_flush_output(void); #endif /* CONSOLE_ENABLE */ -void sendchar_pf(void *p, char c); - #endif /* _USB_MAIN_H_ */ |