diff options
| author | IBNobody <ibnobody@gmail.com> | 2016-06-11 13:28:27 -0500 |
|---|---|---|
| committer | IBNobody <ibnobody@gmail.com> | 2016-06-11 13:28:27 -0500 |
| commit | 50621a2e6a7d03add0c202e5b2698338c7fbbf5b (patch) | |
| tree | d6f002712c22e8cf4523e04a9da889c7ec379d6b /tmk_core/protocol/lufa | |
| parent | 26277dbdf40ba7247981361c956ea44c92bf76ea (diff) | |
| parent | d9e4dad0a828a8a904f44dda090a4d6d08fe2948 (diff) | |
Merge remote-tracking branch 'remotes/jackhumbert/master'
Diffstat (limited to 'tmk_core/protocol/lufa')
| -rw-r--r-- | tmk_core/protocol/lufa/descriptor.c | 2 | ||||
| -rw-r--r-- | tmk_core/protocol/lufa/lufa.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tmk_core/protocol/lufa/descriptor.c b/tmk_core/protocol/lufa/descriptor.c index b345da27b4..1fca8af39c 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 b70b52bf4d..9ca55dbc9d 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) |