Merge pull request #19 from cr3473/master

Makefile - MATRIX selection

2 files changed, 7 insertions, 2 deletions

diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile
index 964e6832e..ad25854e6 100644
--- 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 b/keyboard/planck/matrix_handwired.c
index 2f2dbdb10..2f2dbdb10 100644
--- a/keyboard/planck/matrix.c
+++ b/keyboard/planck/matrix_handwired.c