summaryrefslogtreecommitdiffstats
path: root/keyboards
diff options
context:
space:
mode:
authorErez Zukerman <bulk@ezuk.org>2018-11-19 20:01:22 -0500
committerGitHub <noreply@github.com>2018-11-19 20:01:22 -0500
commit385de70e4d81670ea12526722b78de9521465da9 (patch)
tree55abb005c646cf9951051e9a7a80ab4b7a9299e4 /keyboards
parentf03fd950009fdfd9fa0dcb6d343fe22c6ab386cb (diff)
parent9e0f68a6522a86625f2586003959fd12b18dd86b (diff)
Merge pull request #4442 from drashna/ergodox_ez_glow_configurable
Make Ergodox EZ Glow's rgb matrix user configurable
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/ergodox_ez/ergodox_ez.c1
-rw-r--r--keyboards/ergodox_ez/keymaps/default/keymap.c2
-rw-r--r--keyboards/ergodox_ez/keymaps/default_glow/keymap.c1
-rw-r--r--keyboards/ergodox_ez/keymaps/default_glow/rules.mk4
-rw-r--r--keyboards/ergodox_ez/rules.mk8
5 files changed, 12 insertions, 4 deletions
diff --git a/keyboards/ergodox_ez/ergodox_ez.c b/keyboards/ergodox_ez/ergodox_ez.c
index 61f910711a..3b2c943506 100644
--- a/keyboards/ergodox_ez/ergodox_ez.c
+++ b/keyboards/ergodox_ez/ergodox_ez.c
@@ -269,6 +269,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
};
+__attribute__ ((weak))
const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
/*{row | col << 4}
diff --git a/keyboards/ergodox_ez/keymaps/default/keymap.c b/keyboards/ergodox_ez/keymaps/default/keymap.c
index ef70decd53..49de607737 100644
--- a/keyboards/ergodox_ez/keymaps/default/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/default/keymap.c
@@ -1,6 +1,4 @@
#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
#include "version.h"
#define BASE 0 // default layer
diff --git a/keyboards/ergodox_ez/keymaps/default_glow/keymap.c b/keyboards/ergodox_ez/keymaps/default_glow/keymap.c
new file mode 100644
index 0000000000..526c364029
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/default_glow/keymap.c
@@ -0,0 +1 @@
+// Placeholder. See ../default/keymap.c for details
diff --git a/keyboards/ergodox_ez/keymaps/default_glow/rules.mk b/keyboards/ergodox_ez/keymaps/default_glow/rules.mk
new file mode 100644
index 0000000000..360c3c51b8
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/default_glow/rules.mk
@@ -0,0 +1,4 @@
+RGBLIGHT_ENABLE = no
+RGB_MATRIX_ENABLE = yes # enable later
+
+SRC += ../default/keymap.c
diff --git a/keyboards/ergodox_ez/rules.mk b/keyboards/ergodox_ez/rules.mk
index ef2aefbb9a..446ba3e21a 100644
--- a/keyboards/ergodox_ez/rules.mk
+++ b/keyboards/ergodox_ez/rules.mk
@@ -15,8 +15,7 @@
#----------------------------------------------------------------------------
# # project specific files
-SRC = matrix.c \
- i2c_master.c
+SRC += matrix.c
# MCU name
MCU = atmega32u4
@@ -85,4 +84,9 @@ API_SYSEX_ENABLE = no
RGBLIGHT_ENABLE = yes
RGB_MATRIX_ENABLE = no # enable later
+ifeq ($(strip $(RGB_MATRIX_ENABLE)), no)
+ SRC += i2c_master.c
+endif
+
+
LAYOUTS = ergodox