aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-11-23 21:28:12 -0500
committerJack Humbert <jack.humb@gmail.com>2016-11-23 21:28:12 -0500
commitf25596b8dc2f15f620c07164d871023d9284618c (patch)
tree5f49445087742533f5aed2567883ad59ddc47182 /keyboards/ergodox
parentcefa8468fb5f28bd67a0c02d371a4aef0964e20c (diff)
downloadfirmware-f25596b8dc2f15f620c07164d871023d9284618c.tar.gz
firmware-f25596b8dc2f15f620c07164d871023d9284618c.tar.bz2
firmware-f25596b8dc2f15f620c07164d871023d9284618c.zip
rgblight fixes
Diffstat (limited to 'keyboards/ergodox')
-rw-r--r--keyboards/ergodox/keymaps/erez_experimental/Makefile4
-rw-r--r--keyboards/ergodox/keymaps/erez_experimental/keymap.c8
2 files changed, 7 insertions, 5 deletions
diff --git a/keyboards/ergodox/keymaps/erez_experimental/Makefile b/keyboards/ergodox/keymaps/erez_experimental/Makefile
index dbe89d141..51a0c74c5 100644
--- a/keyboards/ergodox/keymaps/erez_experimental/Makefile
+++ b/keyboards/ergodox/keymaps/erez_experimental/Makefile
@@ -3,8 +3,8 @@
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
COMMAND_ENABLE = no # Commands for debug and configuration
-RGBLIGHT_ENABLE = yes
-MIDI_ENABLE = yes
+RGBLIGHT_ENABLE ?= yes
+MIDI_ENABLE ?= yes
ifndef QUANTUM_DIR
include ../../../../Makefile
diff --git a/keyboards/ergodox/keymaps/erez_experimental/keymap.c b/keyboards/ergodox/keymaps/erez_experimental/keymap.c
index 4a23c7ac5..0c0e3c4e3 100644
--- a/keyboards/ergodox/keymaps/erez_experimental/keymap.c
+++ b/keyboards/ergodox/keymaps/erez_experimental/keymap.c
@@ -164,9 +164,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
// dynamically generate these.
case RGB_FF00BB:
if (record->event.pressed) {
- rgblight_enable();
- rgblight_mode(1);
- rgblight_setrgb(0xff,0x00,0xbb);
+ #ifdef RGBLIGHT_ENABLE
+ rgblight_enable();
+ rgblight_mode(1);
+ rgblight_setrgb(0xff,0x00,0xbb);
+ #endif
}
return false;
break;