summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcr3473 <joe@createtank.com>2015-06-02 12:12:44 -0700
committercr3473 <joe@createtank.com>2015-06-02 12:12:44 -0700
commit59f2001b311dc85fc5b6b8851080b0bb70f2aadf (patch)
tree52f33f7a74e57ef84374dc6a26bfa2b20a28a3ba
parent8c788f70f6aec70732530b76be943373df50bd44 (diff)
downloadqmk_firmware-59f2001b311dc85fc5b6b8851080b0bb70f2aadf.tar.gz
qmk_firmware-59f2001b311dc85fc5b6b8851080b0bb70f2aadf.zip
Added ability to set the MATRIX in build/make
-rw-r--r--keyboard/planck/Makefile9
-rw-r--r--keyboard/planck/matrix_handwired.c (renamed from keyboard/planck/matrix.c)0
2 files changed, 7 insertions, 2 deletions
diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile
index 964e6832ea..ad25854e6d 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 2f2dbdb108..2f2dbdb108 100644
--- a/keyboard/planck/matrix.c
+++ b/keyboard/planck/matrix_handwired.c