6 files changed, 19 insertions, 14 deletions

diff --git a/tmk_core/common/host.c b/tmk_core/common/host.c
index e9b791670..11a05c2dd 100644
--- a/tmk_core/common/host.c
+++ b/tmk_core/common/host.c
@@ -86,7 +86,7 @@ void host_consumer_send(uint16_t report)
     (*driver->send_consumer)(report);
 }
 
-uint16_t host_last_sysytem_report(void)
+uint16_t host_last_system_report(void)
 {
     return last_system_report;
 }
diff --git a/tmk_core/common/host.h b/tmk_core/common/host.h
index 918af69e8..9814b10d2 100644
--- a/tmk_core/common/host.h
+++ b/tmk_core/common/host.h
@@ -47,7 +47,7 @@ void host_mouse_send(report_mouse_t *report);
 void host_system_send(uint16_t data);
 void host_consumer_send(uint16_t data);
 
-uint16_t host_last_sysytem_report(void);
+uint16_t host_last_system_report(void);
 uint16_t host_last_consumer_report(void);
 
 #ifdef __cplusplus
diff --git a/tmk_core/protocol/lufa.mk b/tmk_core/protocol/lufa.mk
index cd9450755..0eeace44e 100644
--- a/tmk_core/protocol/lufa.mk
+++ b/tmk_core/protocol/lufa.mk
@@ -47,6 +47,11 @@ LUFA_OPTS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABL
 LUFA_OPTS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 
 LUFA_OPTS += -DFIXED_NUM_CONFIGURATIONS=1
 
+# Remote wakeup fix for ATmega32U2        https://github.com/tmk/tmk_keyboard/issues/361
+ifeq ($(MCU),atmega32u2)
+        LUFA_OPTS += -DNO_LIMITED_CONTROLLER_CONNECT
+endif
+
 OPT_DEFS += -DF_USB=$(F_USB)UL
 OPT_DEFS += -DARCH=ARCH_$(ARCH)
 OPT_DEFS += $(LUFA_OPTS)
diff --git a/tmk_core/protocol/lufa/descriptor.c b/tmk_core/protocol/lufa/descriptor.c
index 1fca8af39..850a20fdb 100644
--- a/tmk_core/protocol/lufa/descriptor.c
+++ b/tmk_core/protocol/lufa/descriptor.c
@@ -172,13 +172,13 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM ConsoleReport[] =
     HID_RI_COLLECTION(8, 0x01), /* Application */
         HID_RI_USAGE(8, 0x75), /* Vendor Usage 0x75 */
         HID_RI_LOGICAL_MINIMUM(8, 0x00),
-        HID_RI_LOGICAL_MAXIMUM(8, 0xFF),
+        HID_RI_LOGICAL_MAXIMUM(16, 0x00FF),
         HID_RI_REPORT_COUNT(8, CONSOLE_EPSIZE),
         HID_RI_REPORT_SIZE(8, 0x08),
         HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
         HID_RI_USAGE(8, 0x76), /* Vendor Usage 0x76 */
         HID_RI_LOGICAL_MINIMUM(8, 0x00),
-        HID_RI_LOGICAL_MAXIMUM(8, 0xFF),
+        HID_RI_LOGICAL_MAXIMUM(16, 0x00FF),
         HID_RI_REPORT_COUNT(8, CONSOLE_EPSIZE),
         HID_RI_REPORT_SIZE(8, 0x08),
         HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE),
diff --git a/tmk_core/protocol/vusb/vusb.c b/tmk_core/protocol/vusb/vusb.c
index 7d0292ed1..eaa1c512d 100644
--- a/tmk_core/protocol/vusb/vusb.c
+++ b/tmk_core/protocol/vusb/vusb.c
@@ -266,7 +266,7 @@ const PROGMEM uchar keyboard_hid_report[] = {
     0x95, 0x06,          //   Report Count (6),
     0x75, 0x08,          //   Report Size (8),
     0x15, 0x00,          //   Logical Minimum (0),
-    0x25, 0xFF,          //   Logical Maximum(255),
+    0x25, 0xFF, 0x00     //   Logical Maximum(255),
     0x05, 0x07,          //   Usage Page (Key Codes),
     0x19, 0x00,          //   Usage Minimum (0),
     0x29, 0xFF,          //   Usage Maximum (255),
@@ -336,7 +336,7 @@ const PROGMEM uchar mouse_hid_report[] = {
     0xa1, 0x01,                    // COLLECTION (Application)
     0x85, REPORT_ID_SYSTEM,        //   REPORT_ID (2)
     0x15, 0x01,                    //   LOGICAL_MINIMUM (0x1)
-    0x25, 0xb7,                    //   LOGICAL_MAXIMUM (0xb7)
+    0x25, 0xb7, 0x00               //   LOGICAL_MAXIMUM (0xb7)
     0x19, 0x01,                    //   USAGE_MINIMUM (0x1)
     0x29, 0xb7,                    //   USAGE_MAXIMUM (0xb7)
     0x75, 0x10,                    //   REPORT_SIZE (16)
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index e9ef5ca7b..07700283e 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -622,7 +622,7 @@ show_path:
         @echo VPATH=$(VPATH)
         @echo SRC=$(SRC)
 
-SUBDIRS := $(sort $(dir $(wildcard $(TOP_DIR)/keyboard/*/.)))
+SUBDIRS := $(sort $(dir $(wildcard $(TOP_DIR)/keyboards/*/.)))
 all-keyboards-defaults-%:
         @for x in $(SUBDIRS) ; do \
                 printf "Compiling with default: $$x" | $(AWK_CMD); \
@@ -631,14 +631,14 @@ all-keyboards-defaults-%:
 
 all-keyboards-defaults: all-keyboards-defaults-all
 
-KEYBOARDS := $(SUBDIRS:$(TOP_DIR)/keyboard/%/=/keyboard/%)
+KEYBOARDS := $(SUBDIRS:$(TOP_DIR)/keyboards/%/=/keyboards/%)
 all-keyboards-all: $(addsuffix -all,$(KEYBOARDS))
 all-keyboards-quick: $(addsuffix -quick,$(KEYBOARDS))
 all-keyboards-clean: $(addsuffix -clean,$(KEYBOARDS))
 all-keyboards: all-keyboards-all
 
 define make_keyboard
-$(eval KEYBOARD=$(patsubst /keyboard/%,%,$1))
+$(eval KEYBOARD=$(patsubst /keyboards/%,%,$1))
 $(eval KEYMAPS=$(notdir $(patsubst %/.,%,$(wildcard $(TOP_DIR)$1/keymaps/*/.))))
 @for x in $(KEYMAPS) ; do \
         printf "Compiling $(BOLD)$(KEYBOARD)$(NO_COLOR) with $(BOLD)$$x$(NO_COLOR)" | $(AWK) '{ printf "%-88s", $$0; }'; \
@@ -651,18 +651,18 @@ define make_keyboard_helper
 $(call make_keyboard,$(subst -$2,,$1),$2)
 endef
 
-/keyboard/%-quick:
+/keyboards/%-quick:
         $(call make_keyboard_helper,$@,quick)
-/keyboard/%-all:
+/keyboards/%-all:
         $(call make_keyboard_helper,$@,all)
-/keyboard/%-clean:
+/keyboards/%-clean:
         $(call make_keyboard_helper,$@,clean)
-/keyboard/%:
+/keyboards/%:
         $(call make_keyboard_helper,$@,all)
 
 all-keymaps-%:
         $(eval MAKECONFIG=$(call get_target,all-keymaps,$@))
-        $(eval KEYMAPS=$(notdir $(patsubst %/.,%,$(wildcard $(TOP_DIR)/keyboard/$(KEYBOARD)/keymaps/*/.))))
+        $(eval KEYMAPS=$(notdir $(patsubst %/.,%,$(wildcard $(TOP_DIR)/keyboards/$(KEYBOARD)/keymaps/*/.))))
         @for x in $(KEYMAPS) ; do \
                 printf "Compiling $(BOLD)$(KEYBOARD)$(NO_COLOR) with $(BOLD)$$x$(NO_COLOR)" | $(AWK) '{ printf "%-88s", $$0; }'; \
                 LOG=$$($(MAKE) $(subst all-keymaps-,,$@) keyboard=$(KEYBOARD) keymap=$$x VERBOSE=$(VERBOSE) COLOR=$(COLOR) SILENT=true 2>&1) ; if [ $$? -gt 0 ]; then $(PRINT_ERROR_PLAIN); elif [ "$$LOG" != "" ] ; then $(PRINT_WARNING_PLAIN); else $(PRINT_OK); fi; \