Revert "Fix conflicting types for 'tfp_printf' (#8269)"

This reverts commit e17b55e33a.
2020-05-04 09:25:44 -07:00
parent 1ff526dac0
commit 6f30b402a2
10 changed files with 357 additions and 15 deletions
--- 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")