summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2018-10-31 02:00:43 +0100
committerJack Humbert <jack.humb@gmail.com>2018-11-06 06:40:02 +0100
commit40313cfa3b4a4f1643382f0446e0a889ef3e76dc (patch)
tree47a6e3a1ae4f48bcf75f8a85857f3b5fbff06b84
parentec34b5386455a4170db97aad21dc50b77d6ddfdd (diff)
downloadqmk_firmware-40313cfa3b4a4f1643382f0446e0a889ef3e76dc.tar.gz
qmk_firmware-40313cfa3b4a4f1643382f0446e0a889ef3e76dc.tar.xz
Fix Terminal feature on ChibiOS
-rw-r--r--common_features.mk1
-rw-r--r--tmk_core/common.mk4
-rw-r--r--tmk_core/common/print.h2
3 files changed, 6 insertions, 1 deletions
diff --git a/common_features.mk b/common_features.mk
index f44dfc47d..8f53a82aa 100644
--- 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 3844b13d4..65dcf96f6 100644
--- 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 d94527657..06c6cbd7f 100644
--- 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 */