Merge pull request tmk#19 from cr3473/master

Makefile - MATRIX selection
lxol · Jun 2, 2015 · 6001a93 · 6001a93
2 parents 81c6723 + bb9e23c
commit 6001a93
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile
@@ -47,13 +47,18 @@ 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_pcb.c \
+	$(MATRIX) \
 	led.c \
 	backlight.c
 
@@ -66,7 +71,7 @@ endif
 else
 
 SRC = extended_keymap_common.c \
-	matrix_pcb.c \
+	$(MATRIX) \
 	led.c \
 	backlight.c
 

diff --git a/keyboard/planck/matrix.c → keyboard/planck/matrix_handwired.c b/keyboard/planck/matrix.c → keyboard/planck/matrix_handwired.c