diff options
Diffstat (limited to 'tmk_core/protocol')
| -rw-r--r-- | tmk_core/protocol/lufa.mk | 22 | ||||
| -rw-r--r-- | tmk_core/protocol/lufa/descriptor.c | 2 | ||||
| -rw-r--r-- | tmk_core/protocol/lufa/lufa.c | 5 |
3 files changed, 16 insertions, 13 deletions
diff --git a/tmk_core/protocol/lufa.mk b/tmk_core/protocol/lufa.mk index 9ac6298f1..b0f891900 100644 --- a/tmk_core/protocol/lufa.mk +++ b/tmk_core/protocol/lufa.mk @@ -5,23 +5,23 @@ LUFA_PATH ?= $(LUFA_DIR)/LUFA-git # Create the LUFA source path variables by including the LUFA makefile -ifneq (, $(wildcard $(TMK_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk)) +ifneq (, $(wildcard $(TMK_PATH)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk)) # New build system from 20120730 LUFA_ROOT_PATH = $(LUFA_PATH)/LUFA - include $(TMK_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk + include $(TMK_PATH)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk else - include $(TMK_DIR)/$(LUFA_PATH)/LUFA/makefile + include $(TMK_PATH)/$(LUFA_PATH)/LUFA/makefile endif -LUFA_SRC = $(LUFA_DIR)/lufa.c \ - $(LUFA_DIR)/descriptor.c \ +LUFA_SRC = lufa.c \ + descriptor.c \ $(LUFA_SRC_USB) ifeq ($(strip $(MIDI_ENABLE)), yes) - LUFA_SRC += $(LUFA_DIR)/midi/midi.c \ - $(LUFA_DIR)/midi/midi_device.c \ - $(LUFA_DIR)/midi/bytequeue/bytequeue.c \ - $(LUFA_DIR)/midi/bytequeue/interrupt_setting.c \ + LUFA_SRC += midi/midi.c \ + midi/midi_device.c \ + midi/bytequeue/bytequeue.c \ + midi/bytequeue/interrupt_setting.c \ $(LUFA_SRC_USBCLASS) endif @@ -33,8 +33,8 @@ endif SRC += $(LUFA_SRC) # Search Path -VPATH += $(TMK_DIR)/$(LUFA_DIR) -VPATH += $(TMK_DIR)/$(LUFA_PATH) +VPATH += $(TMK_PATH)/$(LUFA_DIR) +VPATH += $(TMK_PATH)/$(LUFA_PATH) # Option modules #ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE) diff --git a/tmk_core/protocol/lufa/descriptor.c b/tmk_core/protocol/lufa/descriptor.c index b345da27b..1fca8af39 100644 --- a/tmk_core/protocol/lufa/descriptor.c +++ b/tmk_core/protocol/lufa/descriptor.c @@ -76,7 +76,7 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM KeyboardReport[] = HID_RI_USAGE_MINIMUM(8, 0x00), /* Reserved (no event indicated) */ HID_RI_USAGE_MAXIMUM(8, 0xFF), /* Keyboard Application */ HID_RI_LOGICAL_MINIMUM(8, 0x00), - HID_RI_LOGICAL_MAXIMUM(8, 0xFF), + HID_RI_LOGICAL_MAXIMUM(16, 0x00FF), HID_RI_REPORT_COUNT(8, 0x06), HID_RI_REPORT_SIZE(8, 0x08), HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_ARRAY | HID_IOF_ABSOLUTE), diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c index b70b52bf4..9ca55dbc9 100644 --- a/tmk_core/protocol/lufa/lufa.c +++ b/tmk_core/protocol/lufa/lufa.c @@ -838,7 +838,10 @@ static void setup_mcu(void) wdt_disable(); /* Disable clock division */ - clock_prescale_set(clock_div_1); + // clock_prescale_set(clock_div_1); + + CLKPR = (1 << CLKPCE); + CLKPR = (0 << CLKPS3) | (0 << CLKPS2) | (0 << CLKPS1) | (0 << CLKPS0); } static void setup_usb(void) |