making the extended keymap the default - no more 'common'

keyboard/planck/Makefile

@@ -41,46 +41,23 @@
 # Target file name (without extension).
 TARGET = planck_lufa
 
+
 # Directory common source filess exist
 TOP_DIR = ../..
 
 # 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) \
+SRC = keymap_common.c \
+	matrix.c \
 	led.c \
 	backlight.c
 
 ifdef KEYMAP
-    SRC := common_keymaps/keymap_$(KEYMAP).c $(SRC)
+    SRC := 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
-
-ifdef KEYMAP
-    SRC := extended_keymaps/extended_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
@@ -145,8 +122,10 @@ 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
+NKRO_ENABLE = yes		# USB Nkey Rollover - not yet supported in LUFA
 BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
+#MIDI_ENABLE = YES 		# MIDI controls
+BACKLIGHT_ENABLE = yes
 
 # Optimize size but this may cause error "relocation truncated to fit"
 #EXTRALDFLAGS = -Wl,--relax
@@ -158,3 +137,4 @@ VPATH += $(TOP_DIR)
 include $(TOP_DIR)/protocol/lufa.mk
 include $(TOP_DIR)/common.mk
 include $(TOP_DIR)/rules.mk
+