merging tmk

[qmk_firmware.git] / keyboard / planck / Makefile

diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile
index ad25854e6da3f1670b8e9ef64c736dc2fe829c12..fc26905d80233819bd29b3a757bfaaa1ed26b636 100644 (file)
--- a/keyboard/planck/Makefile
+++ b/keyboard/planck/Makefile
@@ -39,48 +39,24 @@
 #----------------------------------------------------------------------------
 
 # Target file name (without extension).
-TARGET = planck_lufa
+TARGET = planck
+
 
 # Directory common source filess exist
 TOP_DIR = ../..
+TMK_DIR = ../../tmk_core
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
 
-# Default to PCB matrix
-ifndef MATRIX
-       MATRIX=matrix_pcb.c
-endif
-
-$(warning MATRIX: $(MATRIX))
-
 # # project specific files
-ifdef COMMON
-
-       SRC = keymap_common.c \
-       $(MATRIX) \
-       led.c \
-       backlight.c
-
-ifdef KEYMAP
-    SRC := common_keymaps/keymap_$(KEYMAP).c $(SRC)
-else
-    SRC := common_keymaps/keymap_jack.c $(SRC)
-endif
-
-else
-
-SRC = extended_keymap_common.c \
-       $(MATRIX) \
-       led.c \
-       backlight.c
+SRC = planck.c \
+       backlight.c 
 
 ifdef KEYMAP
-    SRC := extended_keymaps/extended_keymap_$(KEYMAP).c $(SRC)
+    SRC := keymaps/keymap_$(KEYMAP).c $(SRC)
 else
-    SRC := extended_keymaps/extended_keymap_default.c $(SRC)
-endif
-
+    SRC := keymaps/keymap_default.c $(SRC)
 endif
 
 CONFIG_H = config.h
@@ -144,9 +120,13 @@ EXTRAKEY_ENABLE = yes      # Audio control and System control(+450)
 CONSOLE_ENABLE = yes   # Console for debug(+400)
 COMMAND_ENABLE = yes    # Commands for debug and configuration
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-#SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes      # USB Nkey Rollover - not yet supported in LUFA
+# SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
+# NKRO_ENABLE = yes            # USB Nkey Rollover - not yet supported in LUFA
 BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
+MIDI_ENABLE = YES              # MIDI controls
+# UNICODE_ENABLE = YES                 # Unicode
+BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
+
 
 # Optimize size but this may cause error "relocation truncated to fit"
 #EXTRALDFLAGS = -Wl,--relax
@@ -154,7 +134,7 @@ BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
 # Search Path
 VPATH += $(TARGET_DIR)
 VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
+
+include $(TOP_DIR)/quantum.mk
 
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk