X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=keyboard%2Fergodox%2FMakefile.lufa;h=abb57017aee97184744a8a45127b9f21fc9ac409;hb=6edd0fff3727525fe6d61d9d6d605d1759a3e1c3;hp=5c5429554d30fc73af49695cea9d4ce19790a92a;hpb=221af6bffbb8c5af57ae64068d34e5ea165b3a82;p=max%2Ftmk_keyboard.git

diff --git a/keyboard/ergodox/Makefile.lufa b/keyboard/ergodox/Makefile.lufa
index 5c542955..abb57017 100644
--- a/keyboard/ergodox/Makefile.lufa
+++ b/keyboard/ergodox/Makefile.lufa
@@ -42,7 +42,7 @@
 TARGET = ergodox_lufa
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../../tmk_core
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -97,8 +97,7 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 #   Teensy halfKay   512
 #   Atmel DFU loader 4096
 #   LUFA bootloader  4096
-OPT_DEFS += -DBOOTLOADER_SIZE=4096 -DFLASH_SIZE_BYTES=0x8000
-
+OPT_DEFS += -DBOOTLOADER_SIZE=512
 
 # Build Options
 #   comment out to disable the options.
@@ -109,18 +108,19 @@ EXTRAKEY_ENABLE = yes	# Audio control and System control(+600)
 CONSOLE_ENABLE = yes    # Console for debug
 COMMAND_ENABLE = yes    # Commands for debug and configuration
 SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
-#NKRO_ENABLE = yes	# USB Nkey Rollover - not yet supported in LUFA
+NKRO_ENABLE = yes		# USB Nkey Rollover (+500)
 #PS2_MOUSE_ENABLE = yes	# PS/2 mouse(TrackPoint) support
 INVERT_NUMLOCK = yes 	# invert state of NumLock led
 
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk
 
 dvorak: OPT_DEFS += -DKEYMAP_DVORAK
 dvorak: all
@@ -131,6 +131,9 @@ colemak: all
 workman: OPT_DEFS += -DKEYMAP_WORKMAN
 workman: all
 
+micro: OPT_DEFS += -DKEYMAP_MICRO
+micro: all
+
 cub: OPT_DEFS += -DKEYMAP_CUB
 cub: all