hhkb: Change keymap

[max/tmk_keyboard.git] / keyboard / infinity / Makefile

diff --git a/keyboard/infinity/Makefile b/keyboard/infinity/Makefile
index ec9dc00278fd0fb223093945d98d9586820d2fa3..e740b6adbc49254924e297b7b34fbccd07dbdeea 100644 (file)
--- a/keyboard/infinity/Makefile
+++ b/keyboard/infinity/Makefile
@@ -1,7 +1,7 @@
 PROJECT = infinity
 
-TMK_DIR = ../..
-MBED_DIR = $(TMK_DIR)/mbed-sdk
+TMK_DIR = ../../tmk_core
+MBED_DIR = $(TMK_DIR)/tool/mbed/mbed-sdk
 
 #VPATH += $(MBED_DIR):$(TMK_DIR)
 vpath %.s .:$(MBED_DIR):$(TMK_DIR)
@@ -11,8 +11,17 @@ vpath %.cpp .:$(MBED_DIR):$(TMK_DIR)
 OBJDIR = ./build
 
 OBJECTS = \
+       $(OBJDIR)/matrix.o \
+       $(OBJDIR)/keymap_common.o \
+       $(OBJDIR)/led.o \
        $(OBJDIR)/main.o
 
+ifdef KEYMAP
+    OBJECTS := $(OBJDIR)/keymap_$(KEYMAP).o $(OBJECTS)
+else
+    OBJECTS := $(OBJDIR)/keymap.o $(OBJECTS)
+endif
+
 CONFIG_H = config.h
 
 INCLUDE_PATHS = -I.
@@ -24,7 +33,10 @@ INCLUDE_PATHS = -I.
 #MOUSEKEY_ENABLE = yes
 
 
-include $(TMK_DIR)/tool/mbed/mk20d50m.mk
+include mbed-infinity.mk
 include $(TMK_DIR)/tool/mbed/mbed.mk
 include $(TMK_DIR)/tool/mbed/common.mk
 include $(TMK_DIR)/tool/mbed/gcc.mk
+
+program: $(OBJDIR)/$(PROJECT).bin
+       dfu-util -D $(OBJDIR)/$(PROJECT).bin