rgb_led struct conversion (aka: Per led (key) type rgb matrix effects - part 2) (#5783)

* Initial conversion of the rgb_led struct

* Converting last keyboard & updating effects to take advantage of the new structure

* New struct should not be const

* Updated docs

* Changing define ___ for no led to NO_LED

* Missed converting some keymap usages of the old struct layout

1 files changed, 59 insertions, 71 deletions

diff --git a/keyboards/exclusive/e6_rgb/e6_rgb.c b/keyboards/exclusive/e6_rgb/e6_rgb.c
index 42f879990..106e58497 100644
--- a/keyboards/exclusive/e6_rgb/e6_rgb.c
+++ b/keyboards/exclusive/e6_rgb/e6_rgb.c
@@ -114,91 +114,79 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
     {0, E_16,   D_16,   F_16},
     {0, B_16,   A_16,   C_16},
 };
-rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
-/* {row | col << 4}
- *    |           {x=0..224, y=0..64}
- *    |              |            flags
- *    |              |         | */
-//cs1
-    {{0|(0<<4)},    {  0,  0}, 1},
-    {{0|(1<<4)},    { 17,  0}, 4},
-    {{1|(0<<4)},    {  0, 16}, 1},
-    {{2|(0<<4)},    {  0, 32}, 1},
 
+led_config_t g_led_config = { {
+    {   0,   1,   4,   5,  12,  13,  36,  20,  21,  24,  25,  16,  17,  28 },
+    {   2,   6,   7,  14,  15,  37,  38,  22,  23,  26,  27,  18,  19,  30 },
+    {   3,   8,   9,  32,  33,  39,  40,  44,  45,  48,  49,  52,  31, NO_LED },
+    {  59,  10,  11,  34,  35,  41,  42,  46,  47,  50,  53,  54,  56, NO_LED },
+    {  60,  61,  62, NO_LED, NO_LED,  43,  51,  55,  58,  57, NO_LED, NO_LED, NO_LED, NO_LED }
+}, {
+//cs1
+    {   0,   0 }, {  17,   0 }, {   0,  16 }, {   0,  32 },
 //cs2
-    {{0|(2<<4)},    { 34,  0}, 4},
-    {{0|(3<<4)},    { 51,  0}, 4},
-    {{1|(1<<4)},    { 17, 16}, 4},
-    {{1|(2<<4)},    { 34, 16}, 4},
+    {  34,   0 }, {  51,   0 }, {  17,  16 }, {  34,  16 },
 //cs3
-    {{2|(1<<4)},    { 17, 32}, 4},
-    {{2|(2<<4)},    { 34, 32}, 4},
-    {{3|(1<<4)},    { 17, 48}, 4},
-    {{3|(2<<4)},    { 34, 48}, 4},
+    {  17,  32 }, {  34,  32 }, {  17,  48 }, {  34,  48 },
 //cs4
-    {{0|(4<<4)},    { 68,  0}, 4},
-    {{0|(5<<4)},    { 85,  0}, 4},
-    {{1|(3<<4)},    { 51, 16}, 4},
-    {{1|(4<<4)},    { 68, 16}, 4},
+    {  68,   0 }, {  85,   0 }, {  51,  16 }, {  68,  16 },
 //cs5
-    {{0|(11<<4)},   {187,  0}, 4},
-    {{0|(12<<4)},   {204,  0}, 4},
-    {{1|(11<<4)},   {187, 16}, 4},
-    {{1|(12<<4)},   {204, 16}, 4},
+    { 187,   0 }, { 204,   0 }, { 187,  16 }, { 204,  16 },
 //cs6
-    {{0|(7<<4)},    {119,  0}, 4},
-    {{0|(8<<4)},    {136,  0}, 4},
-    {{1|(7<<4)},    {119, 16}, 4},
-    {{1|(8<<4)},    {136, 16}, 4},
+    { 119,   0 }, { 136,   0 }, { 119,  16 }, { 136,  16 },
 //cs7
-    {{0|(9<<4)},    {153,  0}, 4},
-    {{0|(10<<4)},   {170,  0}, 4},
-    {{1|(9<<4)},    {153, 16}, 4},
-    {{1|(10<<4)},   {170, 16}, 4},
+    { 153,   0 }, { 170,   0 }, { 153,  16 }, { 170,  16 },
 //cs8
-    {{0|(13<<4)},   {221,  0}, 4},
-    {{0|(14<<4)},   {221,  0}, 4},
-    {{1|(13<<4)},   {221, 32}, 1},
-    {{2|(12<<4)},   {221, 16}, 1},
+    { 221,   0 }, { 221,   0 }, { 221,  32 }, { 221,  16 },
 //cs9
-    {{2|(3<<4)},    { 51, 32}, 4},
-    {{2|(4<<4)},    { 68, 32}, 4},
-    {{3|(3<<4)},    { 51, 48}, 4},
-    {{3|(4<<4)},    { 68, 48}, 4},
+    {  51,  32 }, {  68,  32 }, {  51,  48 }, {  68,  48 },
 //cs10
-    {{0|(6<<4)},    {102,  0}, 4},
-    {{1|(5<<4)},    { 85, 16}, 4},
-    {{1|(6<<4)},    {102, 16}, 4},
-    {{2|(5<<4)},    { 85, 32}, 4},
+    { 102,   0 }, {  85,  16 }, { 102,  16 }, {  85,  32 },
 //cs11
-    {{2|(6<<4)},    {102, 32}, 4},
-    {{3|(5<<4)},    { 85, 48}, 4},
-    {{3|(6<<4)},    {102, 48}, 4},
-    {{4|(5<<4)},    {102, 64}, 4},
+    { 102,  32 }, {  85,  48 }, { 102,  48 }, { 102,  64 },
 //cs12
-    {{2|(7<<4)},    {119, 32}, 4},
-    {{2|(8<<4)},    {136, 32}, 4},
-    {{3|(7<<4)},    {119, 48}, 4},
-    {{3|(8<<4)},    {136, 48}, 4},
+    { 119,  32 }, { 136,  32 }, { 119,  48 }, { 136,  48 },
 //cs13
-    {{2|(9<<4)},    {153, 32}, 4},
-    {{2|(10<<4)},   {170, 32}, 4},
-    {{3|(9<<4)},    {153, 48}, 4},
-    {{4|(6<<4)},    {136, 48}, 1},
+    { 153,  32 }, { 170,  32 }, { 153,  48 }, { 136,  48 },
 //cs14
-    {{2|(11<<4)},   {187, 32}, 4},
-    {{3|(10<<4)},   {170, 48}, 4},
-    {{3|(11<<4)},   {187, 48}, 1},
-    {{4|(7<<4)},    {153, 48}, 1},
+    { 187,  32 }, { 170,  48 }, { 187,  48 }, { 153,  48 },
 //cs15
-    {{3|(12<<4)},   {221, 48}, 1},
-
-    {{4|(9<<4)},    {221, 64}, 1},
-    {{4|(8<<4)},    {204, 64}, 1},
+    { 221,  48 }, { 221,  64 }, { 204,  64 },
 //cs16
-    {{3|(0<<4)},    {  0, 48}, 1},
-    {{4|(0<<4)},    {  0, 64}, 1},
-    {{4|(1<<4)},    { 17, 64}, 1},
-    {{4|(2<<4)},    { 34, 64}, 1},
-};
+    {   0,  48 }, {   0,  64 }, {  17,  64 }, {  34,  64 }
+}, {
+//cs1
+    1, 4, 1, 1,
+//cs2
+    4, 4, 4, 4,
+//cs3
+    4, 4, 4, 4,
+//cs4
+    4, 4, 4, 4,
+//cs5
+    4, 4, 4, 4,
+//cs6
+    4, 4, 4, 4,
+//cs7
+    4, 4, 4, 4,
+//cs8
+    4, 4, 1, 1,
+//cs9
+    4, 4, 4, 4,
+//cs10
+    4, 4, 4, 4,
+//cs11
+    4, 4, 4, 4,
+//cs12
+    4, 4, 4, 4,
+//cs13
+    4, 4, 4, 1,
+//cs14
+    4, 4, 1, 1,
+//cs15
+    1, 1, 1,
+//cs16
+    1, 1, 1, 1
+} };
+
 #endif