Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Fixing Ergodox_EZ rgb_led initialization

Browse source
This commit is contained in:
Ryan Caltabiano 2019-03-26 18:13:13 -05:00 committed by Drashna Jaelre
parent b90df560f8
commit a0270b55e1
3 changed files with 48 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
keyboards/ergodox_ez/ergodox_ez.c
View file

@ -269,69 +269,68 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
}; };
__attribute__ ((weak))
const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = { const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
/*{row | col << 4} /*{row | col << 4}
| {x=0..224, y=0..64} | {x=0..224, y=0..64}
| | modifier | | modifier
| | | */ | | | */
{{0|(0<<4)}, {24.9*5, 16*0}, 0}, // LED 1 on right {{ 8|(0<<4)}, {17.2* 8, 12.8*0}, 0}, // LED 1 on right > Key 6
{{0|(1<<4)}, {24.9*6, 16*0}, 0}, // LED 2 {{ 9|(0<<4)}, {17.2* 9, 12.8*0}, 0}, // LED 2 > Key 7
{{0|(2<<4)}, {24.9*7, 16*0}, 0}, // LED 3 {{10|(0<<4)}, {17.2*10, 12.8*0}, 0}, // LED 3 > Key 8
{{0|(3<<4)}, {24.9*8, 16*0}, 0}, // LED 4 {{11|(0<<4)}, {17.2*11, 12.8*0}, 0}, // LED 4 > Key 9
{{0|(4<<4)}, {24.9*9, 16*0}, 0}, // LED 5 {{12|(0<<4)}, {17.2*12, 12.8*0}, 0}, // LED 5 > Key 0
{{1|(5<<4)}, {24.9*5, 16*1}, 0}, // LED 6 {{ 8|(1<<4)}, {17.2* 8, 12.8*1}, 0}, // LED 6
{{1|(6<<4)}, {24.9*6, 16*1}, 0}, // LED 7 {{ 9|(1<<4)}, {17.2* 9, 12.8*1}, 0}, // LED 7
{{1|(7<<4)}, {24.9*7, 16*1}, 0}, // LED 8 {{10|(1<<4)}, {17.2*10, 12.8*1}, 0}, // LED 8
{{1|(8<<4)}, {24.9*8, 16*1}, 0}, // LED 9 {{11|(1<<4)}, {17.2*11, 12.8*1}, 0}, // LED 9
{{1|(9<<4)}, {24.9*9, 16*1}, 0}, // LED 10 {{12|(1<<4)}, {17.2*12, 12.8*1}, 0}, // LED 10
{{2|(5<<4)}, {24.9*5, 16*2}, 0}, // LED 11 {{ 8|(2<<4)}, {17.2* 8, 12.8*2}, 0}, // LED 11
{{2|(6<<4)}, {24.9*6, 16*2}, 0}, // LED 12 {{ 9|(2<<4)}, {17.2* 9, 12.8*2}, 0}, // LED 12
{{2|(7<<4)}, {24.9*7, 16*2}, 0}, // LED 13 {{10|(2<<4)}, {17.2*10, 12.8*2}, 0}, // LED 13
{{2|(8<<4)}, {24.9*8, 16*2}, 0}, // LED 14 {{11|(2<<4)}, {17.2*11, 12.8*2}, 0}, // LED 14
{{2|(9<<4)}, {24.9*9, 16*2}, 0}, // LED 15 {{12|(2<<4)}, {17.2*12, 12.8*2}, 0}, // LED 15
{{3|(5<<4)}, {24.9*5, 16*2}, 0}, // LED 16 {{ 8|(3<<4)}, {17.2* 8, 12.8*3}, 0}, // LED 16
{{3|(6<<4)}, {24.9*6, 16*2}, 0}, // LED 17 {{ 9|(3<<4)}, {17.2* 9, 12.8*3}, 0}, // LED 17
{{3|(7<<4)}, {24.9*7, 16*2}, 0}, // LED 18 {{10|(3<<4)}, {17.2*10, 12.8*3}, 0}, // LED 18
{{3|(8<<4)}, {24.9*8, 16*2}, 0}, // LED 19 {{11|(3<<4)}, {17.2*11, 12.8*3}, 0}, // LED 19
{{3|(9<<4)}, {24.9*9, 16*2}, 0}, // LED 20 {{12|(3<<4)}, {17.2*12, 12.8*3}, 0}, // LED 20
{{4|(6<<4)}, {24.9*6, 16*2}, 0}, // LED 21 {{ 9|(4<<4)}, {17.2* 9, 12.8*4}, 1}, // LED 21
{{4|(7<<4)}, {24.9*7, 16*2}, 0}, // LED 22 {{10|(4<<4)}, {17.2*10, 12.8*4}, 1}, // LED 22
{{4|(8<<4)}, {24.9*8, 16*2}, 0}, // LED 23 {{11|(4<<4)}, {17.2*11, 12.8*4}, 1}, // LED 23
{{4|(9<<4)}, {24.9*9, 16*2}, 0}, // LED 24 {{12|(4<<4)}, {17.2*12, 12.8*4}, 1}, // LED 24
{{0|(0<<4)}, {24.9*4, 16*0}, 0}, // LED 1 on left {{ 5|(0<<4)}, {17.2* 5, 12.8*0}, 0}, // LED 1 on left > Key 5
{{0|(1<<4)}, {24.9*3, 16*0}, 0}, // LED 2 {{ 4|(0<<4)}, {17.2* 4, 12.8*0}, 0}, // LED 2 > Key 4
{{0|(2<<4)}, {24.9*2, 16*0}, 0}, // LED 3 {{ 3|(0<<4)}, {17.2* 3, 12.8*0}, 0}, // LED 3 > Key 3
{{0|(3<<4)}, {24.9*1, 16*0}, 0}, // LED 4 {{ 2|(0<<4)}, {17.2* 2, 12.8*0}, 0}, // LED 4 > Key 2
{{0|(4<<4)}, {24.9*0, 16*0}, 0}, // LED 5 {{ 1|(0<<4)}, {17.2* 1, 12.8*0}, 0}, // LED 5 > Key 1
{{1|(5<<4)}, {24.9*4, 16*1}, 0}, // LED 6 {{ 5|(1<<4)}, {17.2* 5, 12.8*1}, 0}, // LED 6
{{1|(6<<4)}, {24.9*3, 16*1}, 0}, // LED 7 {{ 4|(1<<4)}, {17.2* 4, 12.8*1}, 0}, // LED 7
{{1|(7<<4)}, {24.9*2, 16*1}, 0}, // LED 8 {{ 3|(1<<4)}, {17.2* 3, 12.8*1}, 0}, // LED 8
{{1|(8<<4)}, {24.9*1, 16*1}, 0}, // LED 9 {{ 2|(1<<4)}, {17.2* 2, 12.8*1}, 0}, // LED 9
{{1|(9<<4)}, {24.9*0, 16*1}, 0}, // LED 10 {{ 1|(1<<4)}, {17.2* 1, 12.8*1}, 0}, // LED 10
{{2|(5<<4)}, {24.9*4, 16*2}, 0}, // LED 11 {{ 5|(2<<4)}, {17.2* 5, 12.8*2}, 0}, // LED 11
{{2|(6<<4)}, {24.9*3, 16*2}, 0}, // LED 12 {{ 4|(2<<4)}, {17.2* 4, 12.8*2}, 0}, // LED 12
{{2|(7<<4)}, {24.9*2, 16*2}, 0}, // LED 13 {{ 3|(2<<4)}, {17.2* 3, 12.8*2}, 0}, // LED 13
{{2|(8<<4)}, {24.9*1, 16*2}, 0}, // LED 14 {{ 2|(2<<4)}, {17.2* 2, 12.8*2}, 0}, // LED 14
{{2|(9<<4)}, {24.9*0, 16*2}, 0}, // LED 15 {{ 1|(2<<4)}, {17.2* 1, 12.8*2}, 0}, // LED 15
{{3|(5<<4)}, {24.9*4, 16*2}, 0}, // LED 16 {{ 5|(3<<4)}, {17.2* 5, 12.8*3}, 0}, // LED 16
{{3|(6<<4)}, {24.9*3, 16*2}, 0}, // LED 17 {{ 4|(3<<4)}, {17.2* 4, 12.8*3}, 0}, // LED 17
{{3|(7<<4)}, {24.9*2, 16*2}, 0}, // LED 18 {{ 3|(3<<4)}, {17.2* 3, 12.8*3}, 0}, // LED 18
{{3|(8<<4)}, {24.9*1, 16*2}, 0}, // LED 19 {{ 2|(3<<4)}, {17.2* 2, 12.8*3}, 0}, // LED 19
{{3|(9<<4)}, {24.9*0, 16*2}, 0}, // LED 20 {{ 1|(3<<4)}, {17.2* 1, 12.8*3}, 0}, // LED 20
{{4|(6<<4)}, {24.9*3, 16*2}, 0}, // LED 21 {{ 4|(4<<4)}, {17.2* 4, 12.8*4}, 1}, // LED 21
{{4|(7<<4)}, {24.9*2, 16*2}, 0}, // LED 22 {{ 3|(4<<4)}, {17.2* 3, 12.8*4}, 1}, // LED 22
{{4|(8<<4)}, {24.9*1, 16*2}, 0}, // LED 23 {{ 2|(4<<4)}, {17.2* 2, 12.8*4}, 1}, // LED 23
{{4|(9<<4)}, {24.9*0, 16*2}, 0}, // LED 24 {{ 1|(4<<4)}, {17.2* 1, 12.8*4}, 1}, // LED 24 > Key Hack
}; };
#endif #endif

1
layouts/community/ergodox/drashna_glow/README.md
View file

@ -1 +0,0 @@
Note: This board will not flash if the "g_rgb_leds" const is not set to weak in the ergodox_ez.c file

68
layouts/community/ergodox/drashna_glow/keymap.c
View file

@ -1,70 +1,2 @@
/* placeholder file */ /* placeholder file */
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
#ifdef RGB_MATRIX_ENABLE
const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
/*{row | col << 4}
| {x=0..224, y=0..64}
| | modifier
| | | */
{{0|(0<<4)}, {24.9*5, 16*0}, 0}, // LED 1 on right
{{0|(1<<4)}, {24.9*6, 16*0}, 0}, // LED 2
{{0|(2<<4)}, {24.9*7, 16*0}, 0}, // LED 3
{{0|(3<<4)}, {24.9*8, 16*0}, 0}, // LED 4
{{0|(4<<4)}, {24.9*9, 16*0}, 0}, // LED 5
{{1|(5<<4)}, {24.9*5, 16*1}, 0}, // LED 6
{{1|(6<<4)}, {24.9*6, 16*1}, 0}, // LED 7
{{1|(7<<4)}, {24.9*7, 16*1}, 0}, // LED 8
{{1|(8<<4)}, {24.9*8, 16*1}, 0}, // LED 9
{{1|(9<<4)}, {24.9*9, 16*1}, 0}, // LED 10
{{2|(5<<4)}, {24.9*5, 16*2}, 0}, // LED 11
{{2|(6<<4)}, {24.9*6, 16*2}, 0}, // LED 12
{{2|(7<<4)}, {24.9*7, 16*2}, 0}, // LED 13
{{2|(8<<4)}, {24.9*8, 16*2}, 0}, // LED 14
{{2|(9<<4)}, {24.9*9, 16*2}, 0}, // LED 15
{{3|(5<<4)}, {24.9*5, 16*2}, 0}, // LED 16
{{3|(6<<4)}, {24.9*6, 16*2}, 0}, // LED 17
{{3|(7<<4)}, {24.9*7, 16*2}, 0}, // LED 18
{{3|(8<<4)}, {24.9*8, 16*2}, 0}, // LED 19
{{3|(9<<4)}, {24.9*9, 16*2}, 0}, // LED 20
{{4|(6<<4)}, {24.9*6, 16*2}, 1}, // LED 21
{{4|(7<<4)}, {24.9*7, 16*2}, 1}, // LED 22
{{4|(8<<4)}, {24.9*8, 16*2}, 1}, // LED 23
{{4|(9<<4)}, {24.9*9, 16*2}, 1}, // LED 24
{{0|(0<<4)}, {24.9*4, 16*0}, 0}, // LED 1 on left
{{0|(1<<4)}, {24.9*3, 16*0}, 0}, // LED 2
{{0|(2<<4)}, {24.9*2, 16*0}, 0}, // LED 3
{{0|(3<<4)}, {24.9*1, 16*0}, 0}, // LED 4
{{0|(4<<4)}, {24.9*0, 16*0}, 0}, // LED 5
{{1|(5<<4)}, {24.9*4, 16*1}, 0}, // LED 6
{{1|(6<<4)}, {24.9*3, 16*1}, 0}, // LED 7
{{1|(7<<4)}, {24.9*2, 16*1}, 0}, // LED 8
{{1|(8<<4)}, {24.9*1, 16*1}, 0}, // LED 9
{{1|(9<<4)}, {24.9*0, 16*1}, 0}, // LED 10
{{2|(5<<4)}, {24.9*4, 16*2}, 0}, // LED 11
{{2|(6<<4)}, {24.9*3, 16*2}, 0}, // LED 12
{{2|(7<<4)}, {24.9*2, 16*2}, 0}, // LED 13
{{2|(8<<4)}, {24.9*1, 16*2}, 0}, // LED 14
{{2|(9<<4)}, {24.9*0, 16*2}, 0}, // LED 15
{{3|(5<<4)}, {24.9*4, 16*2}, 0}, // LED 16
{{3|(6<<4)}, {24.9*3, 16*2}, 0}, // LED 17
{{3|(7<<4)}, {24.9*2, 16*2}, 0}, // LED 18
{{3|(8<<4)}, {24.9*1, 16*2}, 0}, // LED 19
{{3|(9<<4)}, {24.9*0, 16*2}, 0}, // LED 20
{{4|(6<<4)}, {24.9*3, 16*2}, 1}, // LED 21
{{4|(7<<4)}, {24.9*2, 16*2}, 1}, // LED 22
{{4|(8<<4)}, {24.9*1, 16*2}, 1}, // LED 23
{{4|(9<<4)}, {24.9*0, 16*2}, 1}, // LED 24
};
#endif