X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=tmk_core%2Fprotocol%2Flufa.mk;h=19fc80d480ed8e086a6141f8524e1ab879f6f112;hb=e23520662dfac30c38c41c87f5593c21f1abfb1d;hp=2575e89dfa5081e1ce7440bbd1e9ede0c2254c09;hpb=a3d96d3aa96318d339a67de1085e0ae495d57c84;p=max%2Ftmk_keyboard.git

diff --git a/tmk_core/protocol/lufa.mk b/tmk_core/protocol/lufa.mk
index 2575e89d..19fc80d4 100644
--- a/tmk_core/protocol/lufa.mk
+++ b/tmk_core/protocol/lufa.mk
@@ -1,11 +1,7 @@
 LUFA_DIR = protocol/lufa
 
 # Path to the LUFA library
-ifeq (, $(wildcard $(TMK_DIR)/$(LUFA_DIR)/LUFA-git/LUFA/Version.h))
-    LUFA_PATH ?= $(LUFA_DIR)/LUFA-120730
-else
-    LUFA_PATH ?= $(LUFA_DIR)/LUFA-git
-endif
+LUFA_PATH ?= $(LUFA_DIR)/LUFA-git
 
 
 # Create the LUFA source path variables by including the LUFA makefile
@@ -41,6 +37,10 @@ LUFA_OPTS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABL
 #LUFA_OPTS += -DINTERRUPT_CONTROL_ENDPOINT
 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)
@@ -48,3 +48,21 @@ OPT_DEFS += $(LUFA_OPTS)
 
 # This indicates using LUFA stack
 OPT_DEFS += -DPROTOCOL_LUFA
+
+ifeq (yes,$(strip $(LUFA_DEBUG)))
+    LUFA_OPTS += -DLUFA_DEBUG
+endif
+
+ifeq (yes,$(strip $(LUFA_DEBUG_SUART)))
+    SRC += common/avr/suart.S
+    LUFA_OPTS += -DLUFA_DEBUG_SUART
+    # Keep print/debug lines when disabling HID console. See common.mk.
+    DEBUG_PRINT_AVAILABLE = yes
+endif
+
+ifeq (yes,$(strip $(LUFA_DEBUG_UART)))
+    SRC += common/avr/uart.c
+    LUFA_OPTS += -DLUFA_DEBUG_UART
+    # Keep print/debug lines when disabling HID console. See common.mk.
+    DEBUG_PRINT_AVAILABLE = yes
+endif