Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for: VUSB: undefined references #547 #638

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix for: VUSB: undefined references #547 #638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9a9e80
Fix for: VUSB: undefined references #547
nuess0r Jan 2, 2020
7326d32
Change VUSB NO_UART check the same style as other Makefile options
nuess0r Jan 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions tmk_core/common/command.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,8 +334,10 @@ static bool command_common(uint8_t code)
case KC_S:
print("\n\t- Status -\n");
print_val_hex8(host_keyboard_leds());
#ifndef PROTOCOL_VUSB
print_val_hex8(keyboard_protocol);
print_val_hex8(keyboard_idle);
#endif
#ifdef NKRO_ENABLE
print_val_hex8(keyboard_nkro);
#endif
Expand Down
4 changes: 2 additions & 2 deletions tmk_core/protocol/vusb.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ SRC += $(VUSB_DIR)/main.c \
$(VUSB_DIR)/usbdrv/oddebug.c


ifdef NO_UART
ifeq (yes,$(strip $(NO_UART)))
OPT_DEFS += -DNO_UART
SRC += $(COMMON_DIR)/sendchar_null.c
else
SRC += $(COMMON_DIR)/sendchar_uart.c \
$(COMMON_DIR)/uart.c
$(COMMON_DIR)/avr/uart.c
endif


Expand Down