aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Caltabiano <rcalt2vt@gmail.com>2019-03-26 18:13:13 -0500
committerDrashna Jaelre <drashna@live.com>2019-03-26 16:34:02 -0700
commita0270b55e1e5326ff097644ffe617574f2311d61 (patch)
tree2508990a68807e4f158f0a003ce78eca31fe60cb
parentb90df560f8f5a681eac193b779cb8c5ecb20d681 (diff)
downloadqmk_firmware-a0270b55e1e5326ff097644ffe617574f2311d61.tar.gz
qmk_firmware-a0270b55e1e5326ff097644ffe617574f2311d61.zip
Fixing Ergodox_EZ rgb_led initialization
Diffstat
-rw-r--r--keyboards/ergodox_ez/ergodox_ez.c115
-rw-r--r--layouts/community/ergodox/drashna_glow/README.md1
-rw-r--r--layouts/community/ergodox/drashna_glow/keymap.c68
3 files changed, 57 insertions, 127 deletions
diff --git a/keyboards/ergodox_ez/ergodox_ez.c b/keyboards/ergodox_ez/ergodox_ez.c
index b27a6b89d..6f4ae9fed 100644
--- a/keyboards/ergodox_ez/ergodox_ez.c
+++ b/keyboards/ergodox_ez/ergodox_ez.c
@@ -269,69 +269,68 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
269}; 269};
270 270
271 271
272__attribute__ ((weak))
273const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = { 272const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
274 273
275 /*{row | col << 4} 274 /*{row | col << 4}
276 | {x=0..224, y=0..64} 275 | {x=0..224, y=0..64}
277 | | modifier 276 | | modifier
278 | | | */ 277 | | | */
279 {{0|(0<<4)}, {24.9*5, 16*0}, 0}, // LED 1 on right 278 {{ 8|(0<<4)}, {17.2* 8, 12.8*0}, 0}, // LED 1 on right > Key 6
280 {{0|(1<<4)}, {24.9*6, 16*0}, 0}, // LED 2 279 {{ 9|(0<<4)}, {17.2* 9, 12.8*0}, 0}, // LED 2 > Key 7
281 {{0|(2<<4)}, {24.9*7, 16*0}, 0}, // LED 3 280 {{10|(0<<4)}, {17.2*10, 12.8*0}, 0}, // LED 3 > Key 8
282 {{0|(3<<4)}, {24.9*8, 16*0}, 0}, // LED 4 281 {{11|(0<<4)}, {17.2*11, 12.8*0}, 0}, // LED 4 > Key 9
283 {{0|(4<<4)}, {24.9*9, 16*0}, 0}, // LED 5 282 {{12|(0<<4)}, {17.2*12, 12.8*0}, 0}, // LED 5 > Key 0
284 283
285 {{1|(5<<4)}, {24.9*5, 16*1}, 0}, // LED 6 284 {{ 8|(1<<4)}, {17.2* 8, 12.8*1}, 0}, // LED 6
286 {{1|(6<<4)}, {24.9*6, 16*1}, 0}, // LED 7 285 {{ 9|(1<<4)}, {17.2* 9, 12.8*1}, 0}, // LED 7
287 {{1|(7<<4)}, {24.9*7, 16*1}, 0}, // LED 8 286 {{10|(1<<4)}, {17.2*10, 12.8*1}, 0}, // LED 8
288 {{1|(8<<4)}, {24.9*8, 16*1}, 0}, // LED 9 287 {{11|(1<<4)}, {17.2*11, 12.8*1}, 0}, // LED 9
289 {{1|(9<<4)}, {24.9*9, 16*1}, 0}, // LED 10 288 {{12|(1<<4)}, {17.2*12, 12.8*1}, 0}, // LED 10
290 289
291 {{2|(5<<4)}, {24.9*5, 16*2}, 0}, // LED 11 290 {{ 8|(2<<4)}, {17.2* 8, 12.8*2}, 0}, // LED 11
292 {{2|(6<<4)}, {24.9*6, 16*2}, 0}, // LED 12 291 {{ 9|(2<<4)}, {17.2* 9, 12.8*2}, 0}, // LED 12
293 {{2|(7<<4)}, {24.9*7, 16*2}, 0}, // LED 13 292 {{10|(2<<4)}, {17.2*10, 12.8*2}, 0}, // LED 13
294 {{2|(8<<4)}, {24.9*8, 16*2}, 0}, // LED 14 293 {{11|(2<<4)}, {17.2*11, 12.8*2}, 0}, // LED 14
295 {{2|(9<<4)}, {24.9*9, 16*2}, 0}, // LED 15 294 {{12|(2<<4)}, {17.2*12, 12.8*2}, 0}, // LED 15
296 295
297 {{3|(5<<4)}, {24.9*5, 16*2}, 0}, // LED 16 296 {{ 8|(3<<4)}, {17.2* 8, 12.8*3}, 0}, // LED 16
298 {{3|(6<<4)}, {24.9*6, 16*2}, 0}, // LED 17 297 {{ 9|(3<<4)}, {17.2* 9, 12.8*3}, 0}, // LED 17
299 {{3|(7<<4)}, {24.9*7, 16*2}, 0}, // LED 18 298 {{10|(3<<4)}, {17.2*10, 12.8*3}, 0}, // LED 18
300 {{3|(8<<4)}, {24.9*8, 16*2}, 0}, // LED 19 299 {{11|(3<<4)}, {17.2*11, 12.8*3}, 0}, // LED 19
301 {{3|(9<<4)}, {24.9*9, 16*2}, 0}, // LED 20 300 {{12|(3<<4)}, {17.2*12, 12.8*3}, 0}, // LED 20
302 301
303 {{4|(6<<4)}, {24.9*6, 16*2}, 0}, // LED 21 302 {{ 9|(4<<4)}, {17.2* 9, 12.8*4}, 1}, // LED 21
304 {{4|(7<<4)}, {24.9*7, 16*2}, 0}, // LED 22 303 {{10|(4<<4)}, {17.2*10, 12.8*4}, 1}, // LED 22
305 {{4|(8<<4)}, {24.9*8, 16*2}, 0}, // LED 23 304 {{11|(4<<4)}, {17.2*11, 12.8*4}, 1}, // LED 23
306 {{4|(9<<4)}, {24.9*9, 16*2}, 0}, // LED 24 305 {{12|(4<<4)}, {17.2*12, 12.8*4}, 1}, // LED 24
307 306
308 {{0|(0<<4)}, {24.9*4, 16*0}, 0}, // LED 1 on left 307 {{ 5|(0<<4)}, {17.2* 5, 12.8*0}, 0}, // LED 1 on left > Key 5
309 {{0|(1<<4)}, {24.9*3, 16*0}, 0}, // LED 2 308 {{ 4|(0<<4)}, {17.2* 4, 12.8*0}, 0}, // LED 2 > Key 4
310 {{0|(2<<4)}, {24.9*2, 16*0}, 0}, // LED 3 309 {{ 3|(0<<4)}, {17.2* 3, 12.8*0}, 0}, // LED 3 > Key 3
311 {{0|(3<<4)}, {24.9*1, 16*0}, 0}, // LED 4 310 {{ 2|(0<<4)}, {17.2* 2, 12.8*0}, 0}, // LED 4 > Key 2
312 {{0|(4<<4)}, {24.9*0, 16*0}, 0}, // LED 5 311 {{ 1|(0<<4)}, {17.2* 1, 12.8*0}, 0}, // LED 5 > Key 1
313 312
314 {{1|(5<<4)}, {24.9*4, 16*1}, 0}, // LED 6 313 {{ 5|(1<<4)}, {17.2* 5, 12.8*1}, 0}, // LED 6
315 {{1|(6<<4)}, {24.9*3, 16*1}, 0}, // LED 7 314 {{ 4|(1<<4)}, {17.2* 4, 12.8*1}, 0}, // LED 7
316 {{1|(7<<4)}, {24.9*2, 16*1}, 0}, // LED 8 315 {{ 3|(1<<4)}, {17.2* 3, 12.8*1}, 0}, // LED 8
317 {{1|(8<<4)}, {24.9*1, 16*1}, 0}, // LED 9 316 {{ 2|(1<<4)}, {17.2* 2, 12.8*1}, 0}, // LED 9
318 {{1|(9<<4)}, {24.9*0, 16*1}, 0}, // LED 10 317 {{ 1|(1<<4)}, {17.2* 1, 12.8*1}, 0}, // LED 10
319 318
320 {{2|(5<<4)}, {24.9*4, 16*2}, 0}, // LED 11 319 {{ 5|(2<<4)}, {17.2* 5, 12.8*2}, 0}, // LED 11
321 {{2|(6<<4)}, {24.9*3, 16*2}, 0}, // LED 12 320 {{ 4|(2<<4)}, {17.2* 4, 12.8*2}, 0}, // LED 12
322 {{2|(7<<4)}, {24.9*2, 16*2}, 0}, // LED 13 321 {{ 3|(2<<4)}, {17.2* 3, 12.8*2}, 0}, // LED 13
323 {{2|(8<<4)}, {24.9*1, 16*2}, 0}, // LED 14 322 {{ 2|(2<<4)}, {17.2* 2, 12.8*2}, 0}, // LED 14
324 {{2|(9<<4)}, {24.9*0, 16*2}, 0}, // LED 15 323 {{ 1|(2<<4)}, {17.2* 1, 12.8*2}, 0}, // LED 15
325 324
326 {{3|(5<<4)}, {24.9*4, 16*2}, 0}, // LED 16 325 {{ 5|(3<<4)}, {17.2* 5, 12.8*3}, 0}, // LED 16
327 {{3|(6<<4)}, {24.9*3, 16*2}, 0}, // LED 17 326 {{ 4|(3<<4)}, {17.2* 4, 12.8*3}, 0}, // LED 17
328 {{3|(7<<4)}, {24.9*2, 16*2}, 0}, // LED 18 327 {{ 3|(3<<4)}, {17.2* 3, 12.8*3}, 0}, // LED 18
329 {{3|(8<<4)}, {24.9*1, 16*2}, 0}, // LED 19 328 {{ 2|(3<<4)}, {17.2* 2, 12.8*3}, 0}, // LED 19
330 {{3|(9<<4)}, {24.9*0, 16*2}, 0}, // LED 20 329 {{ 1|(3<<4)}, {17.2* 1, 12.8*3}, 0}, // LED 20
331 330
332 {{4|(6<<4)}, {24.9*3, 16*2}, 0}, // LED 21 331 {{ 4|(4<<4)}, {17.2* 4, 12.8*4}, 1}, // LED 21
333 {{4|(7<<4)}, {24.9*2, 16*2}, 0}, // LED 22 332 {{ 3|(4<<4)}, {17.2* 3, 12.8*4}, 1}, // LED 22
334 {{4|(8<<4)}, {24.9*1, 16*2}, 0}, // LED 23 333 {{ 2|(4<<4)}, {17.2* 2, 12.8*4}, 1}, // LED 23
335 {{4|(9<<4)}, {24.9*0, 16*2}, 0}, // LED 24 334 {{ 1|(4<<4)}, {17.2* 1, 12.8*4}, 1}, // LED 24 > Key Hack
336}; 335};
337#endif 336#endif
diff --git a/layouts/community/ergodox/drashna_glow/README.md b/layouts/community/ergodox/drashna_glow/README.md
deleted file mode 100644
index 7d625a258..000000000
--- a/layouts/community/ergodox/drashna_glow/README.md
+++ /dev/null
@@ -1 +0,0 @@
1Note: This board will not flash if the "g_rgb_leds" const is not set to weak in the ergodox_ez.c file
diff --git a/layouts/community/ergodox/drashna_glow/keymap.c b/layouts/community/ergodox/drashna_glow/keymap.c
index 854555567..7d4bdbec5 100644
--- a/layouts/community/ergodox/drashna_glow/keymap.c
+++ b/layouts/community/ergodox/drashna_glow/keymap.c
@@ -1,70 +1,2 @@
1/* placeholder file */ 1/* placeholder file */
2#include QMK_KEYBOARD_H 2#include QMK_KEYBOARD_H
3
4#ifdef RGB_MATRIX_ENABLE
5const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
6
7 /*{row | col << 4}
8 | {x=0..224, y=0..64}
9 | | modifier
10 | | | */
11 {{0|(0<<4)}, {24.9*5, 16*0}, 0}, // LED 1 on right
12 {{0|(1<<4)}, {24.9*6, 16*0}, 0}, // LED 2
13 {{0|(2<<4)}, {24.9*7, 16*0}, 0}, // LED 3
14 {{0|(3<<4)}, {24.9*8, 16*0}, 0}, // LED 4
15 {{0|(4<<4)}, {24.9*9, 16*0}, 0}, // LED 5
16
17 {{1|(5<<4)}, {24.9*5, 16*1}, 0}, // LED 6
18 {{1|(6<<4)}, {24.9*6, 16*1}, 0}, // LED 7
19 {{1|(7<<4)}, {24.9*7, 16*1}, 0}, // LED 8
20 {{1|(8<<4)}, {24.9*8, 16*1}, 0}, // LED 9
21 {{1|(9<<4)}, {24.9*9, 16*1}, 0}, // LED 10
22
23 {{2|(5<<4)}, {24.9*5, 16*2}, 0}, // LED 11
24 {{2|(6<<4)}, {24.9*6, 16*2}, 0}, // LED 12
25 {{2|(7<<4)}, {24.9*7, 16*2}, 0}, // LED 13
26 {{2|(8<<4)}, {24.9*8, 16*2}, 0}, // LED 14
27 {{2|(9<<4)}, {24.9*9, 16*2}, 0}, // LED 15
28
29 {{3|(5<<4)}, {24.9*5, 16*2}, 0}, // LED 16
30 {{3|(6<<4)}, {24.9*6, 16*2}, 0}, // LED 17
31 {{3|(7<<4)}, {24.9*7, 16*2}, 0}, // LED 18
32 {{3|(8<<4)}, {24.9*8, 16*2}, 0}, // LED 19
33 {{3|(9<<4)}, {24.9*9, 16*2}, 0}, // LED 20
34
35 {{4|(6<<4)}, {24.9*6, 16*2}, 1}, // LED 21
36 {{4|(7<<4)}, {24.9*7, 16*2}, 1}, // LED 22
37 {{4|(8<<4)}, {24.9*8, 16*2}, 1}, // LED 23
38 {{4|(9<<4)}, {24.9*9, 16*2}, 1}, // LED 24
39
40 {{0|(0<<4)}, {24.9*4, 16*0}, 0}, // LED 1 on left
41 {{0|(1<<4)}, {24.9*3, 16*0}, 0}, // LED 2
42 {{0|(2<<4)}, {24.9*2, 16*0}, 0}, // LED 3
43 {{0|(3<<4)}, {24.9*1, 16*0}, 0}, // LED 4
44 {{0|(4<<4)}, {24.9*0, 16*0}, 0}, // LED 5
45
46 {{1|(5<<4)}, {24.9*4, 16*1}, 0}, // LED 6
47 {{1|(6<<4)}, {24.9*3, 16*1}, 0}, // LED 7
48 {{1|(7<<4)}, {24.9*2, 16*1}, 0}, // LED 8
49 {{1|(8<<4)}, {24.9*1, 16*1}, 0}, // LED 9
50 {{1|(9<<4)}, {24.9*0, 16*1}, 0}, // LED 10
51
52 {{2|(5<<4)}, {24.9*4, 16*2}, 0}, // LED 11
53 {{2|(6<<4)}, {24.9*3, 16*2}, 0}, // LED 12
54 {{2|(7<<4)}, {24.9*2, 16*2}, 0}, // LED 13
55 {{2|(8<<4)}, {24.9*1, 16*2}, 0}, // LED 14
56 {{2|(9<<4)}, {24.9*0, 16*2}, 0}, // LED 15
57
58 {{3|(5<<4)}, {24.9*4, 16*2}, 0}, // LED 16
59 {{3|(6<<4)}, {24.9*3, 16*2}, 0}, // LED 17
60 {{3|(7<<4)}, {24.9*2, 16*2}, 0}, // LED 18
61 {{3|(8<<4)}, {24.9*1, 16*2}, 0}, // LED 19
62 {{3|(9<<4)}, {24.9*0, 16*2}, 0}, // LED 20
63
64 {{4|(6<<4)}, {24.9*3, 16*2}, 1}, // LED 21
65 {{4|(7<<4)}, {24.9*2, 16*2}, 1}, // LED 22
66 {{4|(8<<4)}, {24.9*1, 16*2}, 1}, // LED 23
67 {{4|(9<<4)}, {24.9*0, 16*2}, 1}, // LED 24
68};
69
70#endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-18 20:53:14 +0000