localhots
/
qmk_firmware
1
0
Fork 0
Code Releases Activity

Fix Terminal feature on ChibiOS

This commit is contained in:
Drashna Jaelre 2018-10-30 18:00:43 -07:00 committed by Jack Humbert
parent ec34b53864
commit 40313cfa3b
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common_features.mk
View File

@ -213,6 +213,7 @@ endif
ifeq ($(strip $(TERMINAL_ENABLE)), yes) ifeq ($(strip $(TERMINAL_ENABLE)), yes)
SRC += $(QUANTUM_DIR)/process_keycode/process_terminal.c SRC += $(QUANTUM_DIR)/process_keycode/process_terminal.c
OPT_DEFS += -DTERMINAL_ENABLE OPT_DEFS += -DTERMINAL_ENABLE
OPT_DEFS += -DUSER_PRINT
endif endif
ifeq ($(strip $(USB_HID_ENABLE)), yes) ifeq ($(strip $(USB_HID_ENABLE)), yes)

4
tmk_core/common.mk
View File

@ -43,9 +43,11 @@ ifeq ($(PLATFORM),CHIBIOS)
TMK_COMMON_DEFS += -DSTM32_EEPROM_ENABLE TMK_COMMON_DEFS += -DSTM32_EEPROM_ENABLE
else else
TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/eeprom_teensy.c TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/eeprom_teensy.c
endif endif
ifeq ($(strip $(AUTO_SHIFT_ENABLE)), yes) ifeq ($(strip $(AUTO_SHIFT_ENABLE)), yes)
TMK_COMMON_SRC += $(CHIBIOS)/os/various/syscalls.c TMK_COMMON_SRC += $(CHIBIOS)/os/various/syscalls.c
else ifeq($(strip $(TERMINAL_ENABLE)), yes)
TMK_COMMON_SRC += $(CHIBIOS)/os/various/syscalls.c
endif endif
endif endif

2
tmk_core/common/print.h
View File

@ -73,7 +73,9 @@ void print_set_sendchar(int8_t (*print_sendchar_func)(uint8_t));
#elif defined(PROTOCOL_CHIBIOS) /* PROTOCOL_CHIBIOS */ #elif defined(PROTOCOL_CHIBIOS) /* PROTOCOL_CHIBIOS */
#ifndef TERMINAL_ENABLE
# include "chibios/printf.h" # include "chibios/printf.h"
#endif
# ifdef USER_PRINT /* USER_PRINT */ # ifdef USER_PRINT /* USER_PRINT */