Fix Terminal feature on ChibiOS

diff --git a/common_features.mk b/common_features.mk
index f44dfc47de1f918ebd74caaeeef808e96717b4f5..8f53a82aaecaabef5b56cd5b6a7b37363742fa63 100644 (file)
--- a/common_features.mk
+++ b/common_features.mk
@@ -213,6 +213,7 @@ endif
 ifeq ($(strip $(TERMINAL_ENABLE)), yes)
     SRC += $(QUANTUM_DIR)/process_keycode/process_terminal.c
     OPT_DEFS += -DTERMINAL_ENABLE
+    OPT_DEFS += -DUSER_PRINT
 endif
 
 ifeq ($(strip $(USB_HID_ENABLE)), yes)

diff --git a/tmk_core/common.mk b/tmk_core/common.mk
index 3844b13d48db2f0a6402c5900b05d9ea522011c6..65dcf96f6614781a380ad1747397ff790c1be8c7 100644 (file)
--- a/tmk_core/common.mk
+++ b/tmk_core/common.mk
@@ -43,9 +43,11 @@ ifeq ($(PLATFORM),CHIBIOS)
     TMK_COMMON_DEFS += -DSTM32_EEPROM_ENABLE
   else
     TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/eeprom_teensy.c
-endif
+  endif
   ifeq ($(strip $(AUTO_SHIFT_ENABLE)), yes)
     TMK_COMMON_SRC += $(CHIBIOS)/os/various/syscalls.c
+  else ifeq($(strip $(TERMINAL_ENABLE)), yes)
+    TMK_COMMON_SRC += $(CHIBIOS)/os/various/syscalls.c
   endif
 endif
 

diff --git a/tmk_core/common/print.h b/tmk_core/common/print.h
index d9452765725db83535489b1799f4bfc089672297..06c6cbd7f1664e6a0932da9adbd48381f627409d 100644 (file)
--- a/tmk_core/common/print.h
+++ b/tmk_core/common/print.h
@@ -73,7 +73,9 @@ void print_set_sendchar(int8_t (*print_sendchar_func)(uint8_t));
 
 #elif defined(PROTOCOL_CHIBIOS) /* PROTOCOL_CHIBIOS */
 
+#ifndef TERMINAL_ENABLE
 #  include "chibios/printf.h"
+#endif
 
 #  ifdef USER_PRINT /* USER_PRINT */