summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keyboards/ergodox/keymaps/erez_experimental/Makefile4
-rw-r--r--keyboards/ergodox/keymaps/erez_experimental/keymap.c8
-rw-r--r--tmk_core/protocol/lufa/lufa.c2
3 files changed, 8 insertions, 6 deletions
diff --git a/keyboards/ergodox/keymaps/erez_experimental/Makefile b/keyboards/ergodox/keymaps/erez_experimental/Makefile
index dbe89d1410..51a0c74c54 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 4a23c7ac58..0c0e3c4e39 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;
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index eae3e8f298..aa2e781c80 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -1055,7 +1055,7 @@ int main(void)
// MIDI_Task();
#endif
-#ifdef RGBLIGHT_ANIMATIONS
+#if defined(RGBLIGHT_ANIMATIONS) & defined(RGBLIGHT_ENABLE)
rgblight_task();
#endif