summaryrefslogtreecommitdiffstats
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)
Fixing Ergodox_EZ rgb_led initialization
-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 b27a6b89da..6f4ae9fed1 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] = {
};
-__attribute__ ((weak))
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}, 0}, // LED 21
- {{4|(7<<4)}, {24.9*7, 16*2}, 0}, // LED 22
- {{4|(8<<4)}, {24.9*8, 16*2}, 0}, // LED 23
- {{4|(9<<4)}, {24.9*9, 16*2}, 0}, // 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}, 0}, // LED 21
- {{4|(7<<4)}, {24.9*2, 16*2}, 0}, // LED 22
- {{4|(8<<4)}, {24.9*1, 16*2}, 0}, // LED 23
- {{4|(9<<4)}, {24.9*0, 16*2}, 0}, // LED 24
+ {{ 8|(0<<4)}, {17.2* 8, 12.8*0}, 0}, // LED 1 on right > Key 6
+ {{ 9|(0<<4)}, {17.2* 9, 12.8*0}, 0}, // LED 2 > Key 7
+ {{10|(0<<4)}, {17.2*10, 12.8*0}, 0}, // LED 3 > Key 8
+ {{11|(0<<4)}, {17.2*11, 12.8*0}, 0}, // LED 4 > Key 9
+ {{12|(0<<4)}, {17.2*12, 12.8*0}, 0}, // LED 5 > Key 0
+
+ {{ 8|(1<<4)}, {17.2* 8, 12.8*1}, 0}, // LED 6
+ {{ 9|(1<<4)}, {17.2* 9, 12.8*1}, 0}, // LED 7
+ {{10|(1<<4)}, {17.2*10, 12.8*1}, 0}, // LED 8
+ {{11|(1<<4)}, {17.2*11, 12.8*1}, 0}, // LED 9
+ {{12|(1<<4)}, {17.2*12, 12.8*1}, 0}, // LED 10
+
+ {{ 8|(2<<4)}, {17.2* 8, 12.8*2}, 0}, // LED 11
+ {{ 9|(2<<4)}, {17.2* 9, 12.8*2}, 0}, // LED 12
+ {{10|(2<<4)}, {17.2*10, 12.8*2}, 0}, // LED 13
+ {{11|(2<<4)}, {17.2*11, 12.8*2}, 0}, // LED 14
+ {{12|(2<<4)}, {17.2*12, 12.8*2}, 0}, // LED 15
+
+ {{ 8|(3<<4)}, {17.2* 8, 12.8*3}, 0}, // LED 16
+ {{ 9|(3<<4)}, {17.2* 9, 12.8*3}, 0}, // LED 17
+ {{10|(3<<4)}, {17.2*10, 12.8*3}, 0}, // LED 18
+ {{11|(3<<4)}, {17.2*11, 12.8*3}, 0}, // LED 19
+ {{12|(3<<4)}, {17.2*12, 12.8*3}, 0}, // LED 20
+
+ {{ 9|(4<<4)}, {17.2* 9, 12.8*4}, 1}, // LED 21
+ {{10|(4<<4)}, {17.2*10, 12.8*4}, 1}, // LED 22
+ {{11|(4<<4)}, {17.2*11, 12.8*4}, 1}, // LED 23
+ {{12|(4<<4)}, {17.2*12, 12.8*4}, 1}, // LED 24
+
+ {{ 5|(0<<4)}, {17.2* 5, 12.8*0}, 0}, // LED 1 on left > Key 5
+ {{ 4|(0<<4)}, {17.2* 4, 12.8*0}, 0}, // LED 2 > Key 4
+ {{ 3|(0<<4)}, {17.2* 3, 12.8*0}, 0}, // LED 3 > Key 3
+ {{ 2|(0<<4)}, {17.2* 2, 12.8*0}, 0}, // LED 4 > Key 2
+ {{ 1|(0<<4)}, {17.2* 1, 12.8*0}, 0}, // LED 5 > Key 1
+
+ {{ 5|(1<<4)}, {17.2* 5, 12.8*1}, 0}, // LED 6
+ {{ 4|(1<<4)}, {17.2* 4, 12.8*1}, 0}, // LED 7
+ {{ 3|(1<<4)}, {17.2* 3, 12.8*1}, 0}, // LED 8
+ {{ 2|(1<<4)}, {17.2* 2, 12.8*1}, 0}, // LED 9
+ {{ 1|(1<<4)}, {17.2* 1, 12.8*1}, 0}, // LED 10
+
+ {{ 5|(2<<4)}, {17.2* 5, 12.8*2}, 0}, // LED 11
+ {{ 4|(2<<4)}, {17.2* 4, 12.8*2}, 0}, // LED 12
+ {{ 3|(2<<4)}, {17.2* 3, 12.8*2}, 0}, // LED 13
+ {{ 2|(2<<4)}, {17.2* 2, 12.8*2}, 0}, // LED 14
+ {{ 1|(2<<4)}, {17.2* 1, 12.8*2}, 0}, // LED 15
+
+ {{ 5|(3<<4)}, {17.2* 5, 12.8*3}, 0}, // LED 16
+ {{ 4|(3<<4)}, {17.2* 4, 12.8*3}, 0}, // LED 17
+ {{ 3|(3<<4)}, {17.2* 3, 12.8*3}, 0}, // LED 18
+ {{ 2|(3<<4)}, {17.2* 2, 12.8*3}, 0}, // LED 19
+ {{ 1|(3<<4)}, {17.2* 1, 12.8*3}, 0}, // LED 20
+
+ {{ 4|(4<<4)}, {17.2* 4, 12.8*4}, 1}, // LED 21
+ {{ 3|(4<<4)}, {17.2* 3, 12.8*4}, 1}, // LED 22
+ {{ 2|(4<<4)}, {17.2* 2, 12.8*4}, 1}, // LED 23
+ {{ 1|(4<<4)}, {17.2* 1, 12.8*4}, 1}, // LED 24 > Key Hack
};
#endif
diff --git a/layouts/community/ergodox/drashna_glow/README.md b/layouts/community/ergodox/drashna_glow/README.md
deleted file mode 100644
index 7d625a258d..0000000000
--- a/layouts/community/ergodox/drashna_glow/README.md
+++ /dev/null
@@ -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
diff --git a/layouts/community/ergodox/drashna_glow/keymap.c b/layouts/community/ergodox/drashna_glow/keymap.c
index 8545555679..7d4bdbec50 100644
--- a/layouts/community/ergodox/drashna_glow/keymap.c
+++ b/layouts/community/ergodox/drashna_glow/keymap.c
@@ -1,70 +1,2 @@
/* placeholder file */
#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