projects
/
qmk_firmware.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cefa846
)
rgblight fixes
author
Jack Humbert
<jack.humb@gmail.com>
Thu, 24 Nov 2016 02:28:12 +0000
(21:28 -0500)
committer
Jack Humbert
<jack.humb@gmail.com>
Thu, 24 Nov 2016 02:28:12 +0000
(21:28 -0500)
keyboards/ergodox/keymaps/erez_experimental/Makefile
patch
|
blob
|
history
keyboards/ergodox/keymaps/erez_experimental/keymap.c
patch
|
blob
|
history
tmk_core/protocol/lufa/lufa.c
patch
|
blob
|
history
diff --git
a/keyboards/ergodox/keymaps/erez_experimental/Makefile
b/keyboards/ergodox/keymaps/erez_experimental/Makefile
index dbe89d1410c10136e5f43b23d1aa5dd3003d0404..51a0c74c547b5f2e38a8d0141c4cae649a9f388b 100644
(file)
--- 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 4a23c7ac587bd131bed0470048eef51f4815368c..0c0e3c4e39ee10b223dc62ab363989537f14672c 100644
(file)
--- 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 eae3e8f298085de22e0bf896dbb6375a23771013..aa2e781c80ed02ab17b2e4cedce6fc191bdb41c5 100644
(file)
--- a/
tmk_core/protocol/lufa/lufa.c
+++ b/
tmk_core/protocol/lufa/lufa.c
@@
-1055,7
+1055,7
@@
int main(void)
// MIDI_Task();
#endif
-#if
def RGBLIGHT_ANIMATIONS
+#if
defined(RGBLIGHT_ANIMATIONS) & defined(RGBLIGHT_ENABLE)
rgblight_task();
#endif