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
author: XScorpion2 <rcalt2vt@gmail.com> 2019-05-07 18:22:46 -0500
committer: MechMerlin <30334081+mechmerlin@users.noreply.github.com> 2019-05-07 16:22:46 -0700
commit: af89752bffbaf5dcea30ea16be66b4d682701bc4 (patch)
tree: c82f2bc25409159a44778379db8b3a35afc47b8a /keyboards/hs60
parent: c7f8548d9af2045996294602d2a4bd9a214ae23c (diff)
download: qmk_firmware-af89752bffbaf5dcea30ea16be66b4d682701bc4.tar.gz
qmk_firmware-af89752bffbaf5dcea30ea16be66b4d682701bc4.zip
1 files changed, 63 insertions, 155 deletions
diff --git a/keyboards/hs60/v1/v1.c b/keyboards/hs60/v1/v1.c
index bd6dd19b2..5267c9457 100644
--- a/keyboards/hs60/v1/v1.c
+++ b/keyboards/hs60/v1/v1.c
@@ -165,83 +165,37 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
    {1, C9_16,  C7_15,  C6_15}  //D16
 };
-rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+led_config_t g_led_config = { {
-//
+    {  36,  35,  34,  33,  32,  31,  30,   6,   5,   4,   3,   2,   1,   0 },
-//  C7,  C6,  C5,  C4,  C3,  C2,  C1,  A7,  A6,  A5,  A4,  A3,  A2,  A1,
+    {  37,  38,  39,  40,  41,  42,  43,   7,   8,   9,  10,  11,  12, NO_LED },
-//  C8,  C9, C10, C11, C12, C13, C14,  A8,  A9, A10, A11, A12, A13, A15,
+    {  48,  49,  50,  51,  52,  45,  44,  20,  21,  22,  23,  15,  14,  13 },
-//  D4,  D5,  D6,  D7,  D8, C16, C15,  B5,  B6,  B7,  B8, A16, ---, A14,
+    {  47, NO_LED,  46,  53,  54,  55,  56,  19,  18,  17,  16,  24, NO_LED,  25 },
-//  D3, ---,  D1,  D9, D10, D11, D12,  B4,  B3,  B2,  B1,  B9, ---, B10,
+    {  60,  59,  58,  57, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,  29,  28,  27,  26 }
-// D16, D15, D14, ---, ---, ---, D13, ---, ---, ---, B14, B13, B12, B11
+}, {
-/* {row | col << 4}
+        //A1-A16
- *    |           {x=0..224, y=0..64}
+    { 224,   0 }, { 204,   0 }, { 187,   0 }, { 170,   0 }, { 153,   0 }, { 136,   0 }, { 119,   0 }, { 119,  16 }, { 136,  16 }, { 153,  16 }, { 170,  16 }, { 187,  16 }, { 204,  16 }, { 224,  32 },
- *    |              |            flags
+    { 224,  16 }, { 197,  32 },
- *    |              |         | */
+        //B1-B14
-    {{0|(13<<4)},   {224,  0}, 1}, //A1-A16
+    { 170,  48 }, { 153,  48 }, { 136,  48 }, { 119,  48 }, { 119,  32 }, { 136,  32 }, { 153,  32 }, { 170,  32 }, { 187,  48 }, { 214,  48 }, { 224,  64 }, { 204,  64 }, { 187,  64 }, { 170,  64 },
-    {{0|(12<<4)},   {204,  0}, 4},
+        //C1-C16
-    {{0|(11<<4)},   {187,  0}, 4},
+    { 102,   0 }, {  85,   0 }, {  68,   0 }, {  51,   0 }, {  34,   0 }, {  17,   0 }, {   0,   0 }, {   0,  16 }, {  17,  16 }, {  34,  16 }, {  51,  16 }, {  68,  16 }, {  85,  16 }, { 102,  16 },
-    {{0|(10<<4)},   {170,  0}, 4},
+    { 102,  32 }, {  85,  32 },
-    {{0|(9<<4)},    {153,  0}, 4},
+        //D1-D16
-    {{0|(8<<4)},    {136,  0}, 4},
+    {  32,  48 }, {  10,  48 }, {   0,  32 }, {  17,  32 }, {  34,  32 }, {  51,  32 }, {  68,  32 }, {  51,  48 }, {  68,  48 }, {  85,  48 }, { 102,  48 }, { 102,  64 }, {  34,  68 }, {  17,  68 },
-    {{0|(7<<4)},    {119,  0}, 4},
+    {   0,  68 }
-    {{1|(7<<4)},    {119, 16}, 4},
+}, {
-    {{1|(8<<4)},    {136, 16}, 4},
+        //A1-A16
-    {{1|(9<<4)},    {153, 16}, 4},
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    {{1|(10<<4)},   {170, 16}, 4},
+    4, 4,
-    {{1|(11<<4)},   {187, 16}, 4},
+        //B1-B14
-    {{1|(12<<4)},   {204, 16}, 4},
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1,
-    {{2|(13<<4)},   {224, 32}, 1},
+        //C1-C16
-    {{2|(12<<4)},   {224, 16}, 4},
+    4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4,
-    {{2|(11<<4)},   {197, 32}, 4},
+    4, 4,
+        //D1-D16
-    {{3|(10<<4)},   {170, 48}, 4}, //B1-B14
+    4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
-    {{3|(9<<4)},    {153, 48}, 4},
+    1
-    {{3|(8<<4)},    {136, 48}, 4},
+} };
-    {{3|(7<<4)},    {119, 48}, 4},
-    {{2|(7<<4)},    {119, 32}, 4},
-    {{2|(8<<4)},    {136, 32}, 4},
-    {{2|(9<<4)},    {153, 32}, 4},
-    {{2|(10<<4)},   {170, 32}, 4},
-    {{3|(11<<4)},   {187, 48}, 4},
-    {{3|(13<<4)},   {214, 48}, 1},
-    {{4|(13<<4)},   {224, 64}, 1},
-    {{4|(12<<4)},   {204, 64}, 1},
-    {{4|(11<<4)},   {187, 64}, 1},
-    {{4|(10<<4)},   {170, 64}, 1},
-    {{0|(6<<4)},    {102,  0}, 4}, //C1-C16
-    {{0|(5<<4)},    { 85,  0}, 4},
-    {{0|(4<<4)},    { 68,  0}, 4},
-    {{0|(3<<4)},    { 51,  0}, 4},
-    {{0|(2<<4)},    { 34,  0}, 4},
-    {{0|(1<<4)},    { 17,  0}, 4},
-    {{0|(0<<4)},    {  0,  0}, 1},
-    {{1|(0<<4)},    {  0, 16}, 1},
-    {{1|(1<<4)},    { 17, 16}, 4},
-    {{1|(2<<4)},    { 34, 16}, 4},
-    {{1|(3<<4)},    { 51, 16}, 4},
-    {{1|(4<<4)},    { 68, 16}, 4},
-    {{1|(5<<4)},    { 85, 16}, 4},
-    {{1|(6<<4)},    {102, 16}, 4},
-    {{2|(6<<4)},    {102, 32}, 4},
-    {{2|(5<<4)},    { 85, 32}, 4},
-    {{3|(2<<4)},    { 32, 48}, 4}, //D1-D16
-    //D2
-    {{3|(0<<4)},    { 10, 48}, 1},
-    {{2|(0<<4)},    {  0, 32}, 1},
-    {{2|(1<<4)},    { 17, 32}, 4},
-    {{2|(2<<4)},    { 34, 32}, 4},
-    {{2|(3<<4)},    { 51, 32}, 4},
-    {{2|(4<<4)},    { 68, 32}, 4},
-    {{3|(3<<4)},    { 51, 48}, 4},
-    {{3|(4<<4)},    { 68, 48}, 4},
-    {{3|(5<<4)},    { 85, 48}, 4},
-    {{3|(6<<4)},    {102, 48}, 4},
-    {{4|(3<<4)},    {102, 64}, 4},
-    {{4|(2<<4)},    { 34, 68}, 1},
-    {{4|(1<<4)},    { 17, 68}, 1},
-    {{4|(0<<4)},    {  0, 68}, 1}
-};
 #else
@@ -319,83 +273,37 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
    {1, C9_16,  C7_15,  C6_15}  //D16
 };
-rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+led_config_t g_led_config = { {
-//
+    {  36,  35,  34,  33,  32,  31,  30,   6,   5,   4,   3,   2,   1,   0 },
-//  C7,  C6,  C5,  C4,  C3,  C2,  C1,  A7,  A6,  A5,  A4,  A3,  A2,  A1,
+    {  37,  38,  39,  40,  41,  42,  43,   7,   8,   9,  10,  11,  12, NO_LED },
-//  C8,  C9, C10, C11, C12, C13, C14,  A8,  A9, A10, A11, A12, A13, ---,
+    {  49,  50,  51,  52,  53,  45,  44,  20,  21,  22,  23,  15,  14,  13 },
-//  D4,  D5,  D6,  D7,  D8, C16, C15,  B5,  B6,  B7,  B8, A16, A15, A14,
+    {  48,  47,  46,  54,  55,  56,  57,  19,  18,  17,  16,  24, NO_LED,  25 },
-//  D3,  D2,  D1,  D9, D10, D11, D12,  B4,  B3,  B2,  B1,  B9, ---, B10,
+    {  61,  60,  59,  58, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,  29,  28,  27,  26 }
-// D16, D15, D14, ---, ---, ---, D13, ---, ---, ---, B14, B13, B12, B11
+}, {
-/* {row | col << 4}
+        //A1-A16
- *    |           {x=0..224, y=0..64}
+    { 224,   0 }, { 204,   0 }, { 187,   0 }, { 170,   0 }, { 153,   0 }, { 136,   0 }, { 119,   0 }, { 119,  16 }, { 136,  16 }, { 153,  16 }, { 170,  16 }, { 187,  16 }, { 204,  16 }, { 224,   8 },
- *    |              |            flags
+    { 204,  32 }, { 187,  32 },
- *    |              |         | */
+        //B1-B14
-    {{0|(13<<4)},   {224,  0}, 1}, //A1-A16
+    { 170,  48 }, { 153,  48 }, { 136,  48 }, { 119,  48 }, { 119,  32 }, { 136,  32 }, { 153,  32 }, { 170,  32 }, { 187,  48 }, { 214,  48 }, { 224,  64 }, { 204,  64 }, { 187,  64 }, { 170,  64 },
-    {{0|(12<<4)},   {204,  0}, 4},
+        //C1-C16
-    {{0|(11<<4)},   {187,  0}, 4},
+    { 102,   0 }, {  85,   0 }, {  68,   0 }, {  51,   0 }, {  34,   0 }, {  17,   0 }, {   0,   0 }, {   0,  16 }, {  17,  16 }, {  34,  16 }, {  51,  16 }, {  68,  16 }, {  85,  16 }, { 102,  16 },
-    {{0|(10<<4)},   {170,  0}, 4},
+    { 102,  32 }, {  85,  32 },
-    {{0|(9<<4)},    {153,  0}, 4},
+        //D1-D16
-    {{0|(8<<4)},    {136,  0}, 4},
+    {  32,  48 }, {  17,  48 }, {   0,  48 }, {   0,  32 }, {  17,  32 }, {  34,  32 }, {  51,  32 }, {  68,  32 }, {  51,  48 }, {  68,  48 }, {  85,  48 }, { 102,  48 }, { 102,  64 }, {  34,  68 },
-    {{0|(7<<4)},    {119,  0}, 4},
+    {  17,  68 }, {   0,  68 }
-    {{1|(7<<4)},    {119, 16}, 4},
+}, {
-    {{1|(8<<4)},    {136, 16}, 4},
+        //A1-A16
-    {{1|(9<<4)},    {153, 16}, 4},
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    {{1|(10<<4)},   {170, 16}, 4},
+    4, 4,
-    {{1|(11<<4)},   {187, 16}, 4},
+        //B1-B14
-    {{1|(12<<4)},   {204, 16}, 4},
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1,
-    {{2|(13<<4)},   {224,  8}, 1},
+        //C1-C16
-    {{2|(12<<4)},   {204, 32}, 4},
+    4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4,
-    {{2|(11<<4)},   {187, 32}, 4},
+    4, 4,
+        //D1-D16
-    {{3|(10<<4)},   {170, 48}, 4}, //B1-B14
+    4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    {{3|(9<<4)},    {153, 48}, 4},
+    1, 1
-    {{3|(8<<4)},    {136, 48}, 4},
+} };
-    {{3|(7<<4)},    {119, 48}, 4},
-    {{2|(7<<4)},    {119, 32}, 4},
-    {{2|(8<<4)},    {136, 32}, 4},
-    {{2|(9<<4)},    {153, 32}, 4},
-    {{2|(10<<4)},   {170, 32}, 4},
-    {{3|(11<<4)},   {187, 48}, 4},
-    {{3|(13<<4)},   {214, 48}, 1},
-    {{4|(13<<4)},   {224, 64}, 1},
-    {{4|(12<<4)},   {204, 64}, 1},
-    {{4|(11<<4)},   {187, 64}, 1},
-    {{4|(10<<4)},   {170, 64}, 1},
-    {{0|(6<<4)},    {102,  0}, 4}, //C1-C16
-    {{0|(5<<4)},    { 85,  0}, 4},
-    {{0|(4<<4)},    { 68,  0}, 4},
-    {{0|(3<<4)},    { 51,  0}, 4},
-    {{0|(2<<4)},    { 34,  0}, 4},
-    {{0|(1<<4)},    { 17,  0}, 4},
-    {{0|(0<<4)},    {  0,  0}, 1},
-    {{1|(0<<4)},    {  0, 16}, 1},
-    {{1|(1<<4)},    { 17, 16}, 4},
-    {{1|(2<<4)},    { 34, 16}, 4},
-    {{1|(3<<4)},    { 51, 16}, 4},
-    {{1|(4<<4)},    { 68, 16}, 4},
-    {{1|(5<<4)},    { 85, 16}, 4},
-    {{1|(6<<4)},    {102, 16}, 4},
-    {{2|(6<<4)},    {102, 32}, 4},
-    {{2|(5<<4)},    { 85, 32}, 4},
-    {{3|(2<<4)},    { 32, 48}, 4}, //D1-D16
-    {{3|(1<<4)},    { 17, 48}, 4},
-    {{3|(0<<4)},    {  0, 48}, 1},
-    {{2|(0<<4)},    {  0, 32}, 1},
-    {{2|(1<<4)},    { 17, 32}, 4},
-    {{2|(2<<4)},    { 34, 32}, 4},
-    {{2|(3<<4)},    { 51, 32}, 4},
-    {{2|(4<<4)},    { 68, 32}, 4},
-    {{3|(3<<4)},    { 51, 48}, 4},
-    {{3|(4<<4)},    { 68, 48}, 4},
-    {{3|(5<<4)},    { 85, 48}, 4},
-    {{3|(6<<4)},    {102, 48}, 4},
-    {{4|(3<<4)},    {102, 64}, 4},
-    {{4|(2<<4)},    { 34, 68}, 1},
-    {{4|(1<<4)},    { 17, 68}, 1},
-    {{4|(0<<4)},    {  0, 68}, 1}
-};
 #endif
@@ -492,4 +400,4 @@ void suspend_power_down_kb(void)
 void suspend_wakeup_init_kb(void)
 {
    rgb_matrix_set_suspend_state(false);
-}
-\ No newline at end of file
+}
author	XScorpion2 <rcalt2vt@gmail.com>	2019-05-07 18:22:46 -0500
committer	MechMerlin <30334081+mechmerlin@users.noreply.github.com>	2019-05-07 16:22:46 -0700
commit	af89752bffbaf5dcea30ea16be66b4d682701bc4 (patch)
tree	c82f2bc25409159a44778379db8b3a35afc47b8a /keyboards/hs60
parent	c7f8548d9af2045996294602d2a4bd9a214ae23c (diff)
download	qmk_firmware-af89752bffbaf5dcea30ea16be66b4d682701bc4.tar.gz qmk_firmware-af89752bffbaf5dcea30ea16be66b4d682701bc4.zip

diff --git a/keyboards/hs60/v1/v1.c b/keyboards/hs60/v1/v1.c index bd6dd19b2..5267c9457 100644 --- a/keyboards/hs60/v1/v1.c +++ b/keyboards/hs60/v1/v1.c
@@ -165,83 +165,37 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
165	{1, C9_16, C7_15, C6_15} //D16	165	{1, C9_16, C7_15, C6_15} //D16
166	};	166	};
167		167
168	rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {	168	led_config_t g_led_config = { {
169	//	169	{ 36, 35, 34, 33, 32, 31, 30, 6, 5, 4, 3, 2, 1, 0 },
170	// C7, C6, C5, C4, C3, C2, C1, A7, A6, A5, A4, A3, A2, A1,	170	{ 37, 38, 39, 40, 41, 42, 43, 7, 8, 9, 10, 11, 12, NO_LED },
171	// C8, C9, C10, C11, C12, C13, C14, A8, A9, A10, A11, A12, A13, A15,	171	{ 48, 49, 50, 51, 52, 45, 44, 20, 21, 22, 23, 15, 14, 13 },
172	// D4, D5, D6, D7, D8, C16, C15, B5, B6, B7, B8, A16, ---, A14,	172	{ 47, NO_LED, 46, 53, 54, 55, 56, 19, 18, 17, 16, 24, NO_LED, 25 },
173	// D3, ---, D1, D9, D10, D11, D12, B4, B3, B2, B1, B9, ---, B10,	173	{ 60, 59, 58, 57, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 29, 28, 27, 26 }
174	// D16, D15, D14, ---, ---, ---, D13, ---, ---, ---, B14, B13, B12, B11	174	}, {
175	/* {row \| col << 4}	175	//A1-A16
176	* \| {x=0..224, y=0..64}	176	{ 224, 0 }, { 204, 0 }, { 187, 0 }, { 170, 0 }, { 153, 0 }, { 136, 0 }, { 119, 0 }, { 119, 16 }, { 136, 16 }, { 153, 16 }, { 170, 16 }, { 187, 16 }, { 204, 16 }, { 224, 32 },
177	* \| \| flags	177	{ 224, 16 }, { 197, 32 },
178	* \| \| \| */	178	//B1-B14
179	{{0\|(13<<4)}, {224, 0}, 1}, //A1-A16	179	{ 170, 48 }, { 153, 48 }, { 136, 48 }, { 119, 48 }, { 119, 32 }, { 136, 32 }, { 153, 32 }, { 170, 32 }, { 187, 48 }, { 214, 48 }, { 224, 64 }, { 204, 64 }, { 187, 64 }, { 170, 64 },
180	{{0\|(12<<4)}, {204, 0}, 4},	180	//C1-C16
181	{{0\|(11<<4)}, {187, 0}, 4},	181	{ 102, 0 }, { 85, 0 }, { 68, 0 }, { 51, 0 }, { 34, 0 }, { 17, 0 }, { 0, 0 }, { 0, 16 }, { 17, 16 }, { 34, 16 }, { 51, 16 }, { 68, 16 }, { 85, 16 }, { 102, 16 },
182	{{0\|(10<<4)}, {170, 0}, 4},	182	{ 102, 32 }, { 85, 32 },
183	{{0\|(9<<4)}, {153, 0}, 4},	183	//D1-D16
184	{{0\|(8<<4)}, {136, 0}, 4},	184	{ 32, 48 }, { 10, 48 }, { 0, 32 }, { 17, 32 }, { 34, 32 }, { 51, 32 }, { 68, 32 }, { 51, 48 }, { 68, 48 }, { 85, 48 }, { 102, 48 }, { 102, 64 }, { 34, 68 }, { 17, 68 },
185	{{0\|(7<<4)}, {119, 0}, 4},	185	{ 0, 68 }
186	{{1\|(7<<4)}, {119, 16}, 4},	186	}, {
187	{{1\|(8<<4)}, {136, 16}, 4},	187	//A1-A16
188	{{1\|(9<<4)}, {153, 16}, 4},	188	1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
189	{{1\|(10<<4)}, {170, 16}, 4},	189	4, 4,
190	{{1\|(11<<4)}, {187, 16}, 4},	190	//B1-B14
191	{{1\|(12<<4)}, {204, 16}, 4},	191	4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1,
192	{{2\|(13<<4)}, {224, 32}, 1},	192	//C1-C16
193	{{2\|(12<<4)}, {224, 16}, 4},	193	4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4,
194	{{2\|(11<<4)}, {197, 32}, 4},	194	4, 4,
195		195	//D1-D16
196	{{3\|(10<<4)}, {170, 48}, 4}, //B1-B14	196	4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
197	{{3\|(9<<4)}, {153, 48}, 4},	197	1
198	{{3\|(8<<4)}, {136, 48}, 4},	198	} };
199	{{3\|(7<<4)}, {119, 48}, 4},
200	{{2\|(7<<4)}, {119, 32}, 4},
201	{{2\|(8<<4)}, {136, 32}, 4},
202	{{2\|(9<<4)}, {153, 32}, 4},
203	{{2\|(10<<4)}, {170, 32}, 4},
204	{{3\|(11<<4)}, {187, 48}, 4},
205	{{3\|(13<<4)}, {214, 48}, 1},
206	{{4\|(13<<4)}, {224, 64}, 1},
207	{{4\|(12<<4)}, {204, 64}, 1},
208	{{4\|(11<<4)}, {187, 64}, 1},
209	{{4\|(10<<4)}, {170, 64}, 1},
210
211	{{0\|(6<<4)}, {102, 0}, 4}, //C1-C16
212	{{0\|(5<<4)}, { 85, 0}, 4},
213	{{0\|(4<<4)}, { 68, 0}, 4},
214	{{0\|(3<<4)}, { 51, 0}, 4},
215	{{0\|(2<<4)}, { 34, 0}, 4},
216	{{0\|(1<<4)}, { 17, 0}, 4},
217	{{0\|(0<<4)}, { 0, 0}, 1},
218	{{1\|(0<<4)}, { 0, 16}, 1},
219	{{1\|(1<<4)}, { 17, 16}, 4},
220	{{1\|(2<<4)}, { 34, 16}, 4},
221	{{1\|(3<<4)}, { 51, 16}, 4},
222	{{1\|(4<<4)}, { 68, 16}, 4},
223	{{1\|(5<<4)}, { 85, 16}, 4},
224	{{1\|(6<<4)}, {102, 16}, 4},
225	{{2\|(6<<4)}, {102, 32}, 4},
226	{{2\|(5<<4)}, { 85, 32}, 4},
227
228	{{3\|(2<<4)}, { 32, 48}, 4}, //D1-D16
229	//D2
230	{{3\|(0<<4)}, { 10, 48}, 1},
231	{{2\|(0<<4)}, { 0, 32}, 1},
232	{{2\|(1<<4)}, { 17, 32}, 4},
233	{{2\|(2<<4)}, { 34, 32}, 4},
234	{{2\|(3<<4)}, { 51, 32}, 4},
235	{{2\|(4<<4)}, { 68, 32}, 4},
236	{{3\|(3<<4)}, { 51, 48}, 4},
237	{{3\|(4<<4)}, { 68, 48}, 4},
238	{{3\|(5<<4)}, { 85, 48}, 4},
239	{{3\|(6<<4)}, {102, 48}, 4},
240	{{4\|(3<<4)}, {102, 64}, 4},
241	{{4\|(2<<4)}, { 34, 68}, 1},
242	{{4\|(1<<4)}, { 17, 68}, 1},
243	{{4\|(0<<4)}, { 0, 68}, 1}
244	};
245		199
246	#else	200	#else
247		201
@@ -319,83 +273,37 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
319	{1, C9_16, C7_15, C6_15} //D16	273	{1, C9_16, C7_15, C6_15} //D16
320	};	274	};
321		275
322	rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {	276	led_config_t g_led_config = { {
323	//	277	{ 36, 35, 34, 33, 32, 31, 30, 6, 5, 4, 3, 2, 1, 0 },
324	// C7, C6, C5, C4, C3, C2, C1, A7, A6, A5, A4, A3, A2, A1,	278	{ 37, 38, 39, 40, 41, 42, 43, 7, 8, 9, 10, 11, 12, NO_LED },
325	// C8, C9, C10, C11, C12, C13, C14, A8, A9, A10, A11, A12, A13, ---,	279	{ 49, 50, 51, 52, 53, 45, 44, 20, 21, 22, 23, 15, 14, 13 },
326	// D4, D5, D6, D7, D8, C16, C15, B5, B6, B7, B8, A16, A15, A14,	280	{ 48, 47, 46, 54, 55, 56, 57, 19, 18, 17, 16, 24, NO_LED, 25 },
327	// D3, D2, D1, D9, D10, D11, D12, B4, B3, B2, B1, B9, ---, B10,	281	{ 61, 60, 59, 58, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 29, 28, 27, 26 }
328	// D16, D15, D14, ---, ---, ---, D13, ---, ---, ---, B14, B13, B12, B11	282	}, {
329	/* {row \| col << 4}	283	//A1-A16
330	* \| {x=0..224, y=0..64}	284	{ 224, 0 }, { 204, 0 }, { 187, 0 }, { 170, 0 }, { 153, 0 }, { 136, 0 }, { 119, 0 }, { 119, 16 }, { 136, 16 }, { 153, 16 }, { 170, 16 }, { 187, 16 }, { 204, 16 }, { 224, 8 },
331	* \| \| flags	285	{ 204, 32 }, { 187, 32 },
332	* \| \| \| */	286	//B1-B14
333	{{0\|(13<<4)}, {224, 0}, 1}, //A1-A16	287	{ 170, 48 }, { 153, 48 }, { 136, 48 }, { 119, 48 }, { 119, 32 }, { 136, 32 }, { 153, 32 }, { 170, 32 }, { 187, 48 }, { 214, 48 }, { 224, 64 }, { 204, 64 }, { 187, 64 }, { 170, 64 },
334	{{0\|(12<<4)}, {204, 0}, 4},	288	//C1-C16
335	{{0\|(11<<4)}, {187, 0}, 4},	289	{ 102, 0 }, { 85, 0 }, { 68, 0 }, { 51, 0 }, { 34, 0 }, { 17, 0 }, { 0, 0 }, { 0, 16 }, { 17, 16 }, { 34, 16 }, { 51, 16 }, { 68, 16 }, { 85, 16 }, { 102, 16 },
336	{{0\|(10<<4)}, {170, 0}, 4},	290	{ 102, 32 }, { 85, 32 },
337	{{0\|(9<<4)}, {153, 0}, 4},	291	//D1-D16
338	{{0\|(8<<4)}, {136, 0}, 4},	292	{ 32, 48 }, { 17, 48 }, { 0, 48 }, { 0, 32 }, { 17, 32 }, { 34, 32 }, { 51, 32 }, { 68, 32 }, { 51, 48 }, { 68, 48 }, { 85, 48 }, { 102, 48 }, { 102, 64 }, { 34, 68 },
339	{{0\|(7<<4)}, {119, 0}, 4},	293	{ 17, 68 }, { 0, 68 }
340	{{1\|(7<<4)}, {119, 16}, 4},	294	}, {
341	{{1\|(8<<4)}, {136, 16}, 4},	295	//A1-A16
342	{{1\|(9<<4)}, {153, 16}, 4},	296	1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
343	{{1\|(10<<4)}, {170, 16}, 4},	297	4, 4,
344	{{1\|(11<<4)}, {187, 16}, 4},	298	//B1-B14
345	{{1\|(12<<4)}, {204, 16}, 4},	299	4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1,
346	{{2\|(13<<4)}, {224, 8}, 1},	300	//C1-C16
347	{{2\|(12<<4)}, {204, 32}, 4},	301	4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4,
348	{{2\|(11<<4)}, {187, 32}, 4},	302	4, 4,
349		303	//D1-D16
350	{{3\|(10<<4)}, {170, 48}, 4}, //B1-B14	304	4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
351	{{3\|(9<<4)}, {153, 48}, 4},	305	1, 1
352	{{3\|(8<<4)}, {136, 48}, 4},	306	} };
353	{{3\|(7<<4)}, {119, 48}, 4},
354	{{2\|(7<<4)}, {119, 32}, 4},
355	{{2\|(8<<4)}, {136, 32}, 4},
356	{{2\|(9<<4)}, {153, 32}, 4},
357	{{2\|(10<<4)}, {170, 32}, 4},
358	{{3\|(11<<4)}, {187, 48}, 4},
359	{{3\|(13<<4)}, {214, 48}, 1},
360	{{4\|(13<<4)}, {224, 64}, 1},
361	{{4\|(12<<4)}, {204, 64}, 1},
362	{{4\|(11<<4)}, {187, 64}, 1},
363	{{4\|(10<<4)}, {170, 64}, 1},
364
365	{{0\|(6<<4)}, {102, 0}, 4}, //C1-C16
366	{{0\|(5<<4)}, { 85, 0}, 4},
367	{{0\|(4<<4)}, { 68, 0}, 4},
368	{{0\|(3<<4)}, { 51, 0}, 4},
369	{{0\|(2<<4)}, { 34, 0}, 4},
370	{{0\|(1<<4)}, { 17, 0}, 4},
371	{{0\|(0<<4)}, { 0, 0}, 1},
372	{{1\|(0<<4)}, { 0, 16}, 1},
373	{{1\|(1<<4)}, { 17, 16}, 4},
374	{{1\|(2<<4)}, { 34, 16}, 4},
375	{{1\|(3<<4)}, { 51, 16}, 4},
376	{{1\|(4<<4)}, { 68, 16}, 4},
377	{{1\|(5<<4)}, { 85, 16}, 4},
378	{{1\|(6<<4)}, {102, 16}, 4},
379	{{2\|(6<<4)}, {102, 32}, 4},
380	{{2\|(5<<4)}, { 85, 32}, 4},
381
382	{{3\|(2<<4)}, { 32, 48}, 4}, //D1-D16
383	{{3\|(1<<4)}, { 17, 48}, 4},
384	{{3\|(0<<4)}, { 0, 48}, 1},
385	{{2\|(0<<4)}, { 0, 32}, 1},
386	{{2\|(1<<4)}, { 17, 32}, 4},
387	{{2\|(2<<4)}, { 34, 32}, 4},
388	{{2\|(3<<4)}, { 51, 32}, 4},
389	{{2\|(4<<4)}, { 68, 32}, 4},
390	{{3\|(3<<4)}, { 51, 48}, 4},
391	{{3\|(4<<4)}, { 68, 48}, 4},
392	{{3\|(5<<4)}, { 85, 48}, 4},
393	{{3\|(6<<4)}, {102, 48}, 4},
394	{{4\|(3<<4)}, {102, 64}, 4},
395	{{4\|(2<<4)}, { 34, 68}, 1},
396	{{4\|(1<<4)}, { 17, 68}, 1},
397	{{4\|(0<<4)}, { 0, 68}, 1}
398	};
399		307
400	#endif	308	#endif
401		309
@@ -492,4 +400,4 @@ void suspend_power_down_kb(void)
492	void suspend_wakeup_init_kb(void)	400	void suspend_wakeup_init_kb(void)
493	{	401	{
494	rgb_matrix_set_suspend_state(false);	402	rgb_matrix_set_suspend_state(false);
495	} \ No newline at end of file	403	}