1 files changed, 20 insertions, 70 deletions
diff --git a/keyboards/dztech/dz65rgb/dz65rgb.c b/keyboards/dztech/dz65rgb/dz65rgb.c
index 78b345843..e14943d97 100644
--- a/keyboards/dztech/dz65rgb/dz65rgb.c
+++ b/keyboards/dztech/dz65rgb/dz65rgb.c
@@ -73,76 +73,26 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
        {1, C9_16, C7_15, C6_15}, // LD16
        {1, C8_16, C7_16, C6_16}, // LD17
 };
-rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
-    {{1|(7<<4)},   {16*7,  16}, 4},
+led_config_t g_led_config = { {
-    {{1|(6<<4)},   {16*6,  16}, 4},
+    {  17,  16,  15,  14,  13,  12,  11,  10,   9,  18,  19,  20,  21,  22,  23 },
-    {{1|(5<<4)},   {16*5,  16}, 4},
+    {   7,   6,   5,   4,   3,   2,   1,   0,  26,  27,  28,  29,  30,  31,  24 },
-    {{1|(4<<4)},   {16*4,  16}, 4},
+    {   8,  48,  47,  46,  45,  44,  43,  51,  52,  53,  54,  55, NO_LED,  56,  25 },
-    {{1|(3<<4)},   {16*3,  16}, 4},
+    {  49,  40,  39,  38,  37,  36,  60,  61,  62,  63,  57,  58, NO_LED,  59,  32 },
-    {{1|(2<<4)},    {16*2,  16}, 4},
+    {  50,  42,  41, NO_LED, NO_LED,  35, NO_LED, NO_LED,  64,  65,  66,  67, NO_LED,  34,  33 }
-    {{1|(1<<4)},    {16*1,  16}, 4},
+}, {
-    {{1|(0<<4)},    {16*0,  16}, 1},
+    { 112,  16 }, {  96,  16 }, {  80,  16 }, {  64,  16 }, {  48,  16 }, {  32,  16 }, {  16,  16 }, {   0,  16 }, {   0,  32 }, { 128,   0 }, { 112,   0 }, {  96,   0 }, {  80,   0 }, {  64,   0 }, {  48,   0 },
-        {{2|(0<<4)},    {16*0,  32}, 1},
+    {  32,   0 }, {  16,   0 }, {   0,   0 }, { 144,   0 }, { 160,   0 }, { 176,   0 }, { 192,   0 }, { 208,   0 }, { 224,   0 }, { 224,  16 }, { 224,  32 }, { 128,  16 }, { 144,  16 }, { 160,  16 }, { 176,  16 },
-    {{0|(8<<4)},    {16*8,  0}, 1},
+    { 192,  16 }, { 208,  16 }, { 224,  48 }, { 224,  64 }, { 208,  64 }, {  80,  64 }, {  80,  48 }, {  64,  48 }, {  48,  48 }, {  32,  48 }, {  16,  48 }, {  32,  64 }, {  16,  64 }, {  96,  32 }, {  80,  32 },
-    {{0|(7<<4)},    {16*7,  0}, 1},
+    {  64,  32 }, {  48,  32 }, {  32,  32 }, {  16,  32 }, {   0,  48 }, {   0,  64 }, { 112,  32 }, { 128,  32 }, { 144,  32 }, { 160,  32 }, { 176,  32 }, { 208,  32 }, { 160,  48 }, { 176,  48 }, { 208,  48 },
-    {{0|(6<<4)},    {16*6,   0}, 1},
+    {  96,  48 }, { 112,  48 }, { 128,  48 }, { 144,  48 }, { 128,  64 }, { 144,  64 }, { 160,  64 }, { 176,  64 }
-    {{0|(5<<4)},    {16*5,  0}, 1},
+}, {
-    {{0|(4<<4)},    {16*4,  0}, 1},
+    4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
-    {{0|(3<<4)},    {16*3, 0}, 1},
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 4,
-    {{0|(2<<4)},    {16*2,  0}, 1},
+    4, 4, 1, 1, 1, 1, 4, 4, 4, 4, 4, 1, 1, 4, 4,
-    {{0|(1<<4)},    {16*1,  0}, 1},
+    4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    {{0|(0<<4)},    {16*0,  0}, 1},
+    4, 4, 4, 4, 1, 1, 1, 1
-    {{0|(9<<4)},    {16*9,  0}, 1},
+} };
-    {{0|(10<<4)},   {16*10,  0}, 1},
-    {{0|(11<<4)},   {16*11,  0}, 1},
-    {{0|(12<<4)},   {16*12,  0}, 1},
-    {{0|(13<<4)},   {16*13,  0}, 1},
-    {{0|(14<<4)},   {16*14,  0}, 1},
-    {{1|(14<<4)},    {16*14,  16}, 1},
-    {{2|(14<<4)},    {16*14,  32}, 1},
-    {{1|(8<<4)},    {16*8,  16}, 4},
-    {{1|(9<<4)},    {16*9,  16}, 4},
-    {{1|(10<<4)},    {16*10,  16}, 4},
-    {{1|(11<<4)},    {16*11,  16}, 4},
-    {{1|(12<<4)},    {16*12,  16}, 4},
-    {{1|(13<<4)},    {16*13,  16}, 4},
-    {{3|(14<<4)},    {16*14,  48}, 1},
-    {{4|(14<<4)},    {16*14,  64}, 1},
-    {{4|(13<<4)},    {16*13,  64}, 1},
-        {{4|(5<<4)},   {16*5,  64}, 1},
-        {{3|(5<<4)},   {16*5,  48}, 4},
-    {{3|(4<<4)},   {16*4,  48}, 4},
-    {{3|(3<<4)},   {16*3,  48}, 4},
-    {{3|(2<<4)},   {16*2,  48}, 4},
-    {{3|(1<<4)},   {16*1,  48}, 4},
-    {{4|(2<<4)},   {16*2,  64}, 1},
-    {{4|(1<<4)},   {16*1,  64}, 1},
-    {{2|(6<<4)},   {16*6, 32}, 4},
-    {{2|(5<<4)},   {16*5, 32}, 4},
-    {{2|(4<<4)},   {16*4, 32}, 4},
-    {{2|(3<<4)},   {16*3, 32}, 4},
-    {{2|(2<<4)},   {16*2, 32}, 4},
-    {{2|(1<<4)},   {16*1, 32}, 4},
-    {{3|(0<<4)},   {16*0,  48}, 1},
-    {{4|(0<<4)},   {16*0,  64}, 1},
-        {{2|(7<<4)},   {16*7,  32}, 4},
-        {{2|(8<<4)},   {16*8,  32}, 4},
-    {{2|(9<<4)},   {16*9,  32}, 4},
-    {{2|(10<<4)},   {16*10,  32}, 4},
-    {{2|(11<<4)},   {16*11,  32}, 4},
-    {{2|(13<<4)},   {16*13,  32}, 4},
-    {{3|(10<<4)},   {16*10,  48}, 4},
-    {{3|(11<<4)},   {16*11,  48}, 4},
-    {{3|(13<<4)},   {16*13,  48}, 4},
-    {{3|(6<<4)},   {16*6,  48}, 4},
-    {{3|(7<<4)},   {16*7,  48}, 4},
-    {{3|(8<<4)},   {16*8,  48}, 4},
-    {{3|(9<<4)},   {16*9,  48}, 4},
-    {{4|(8<<4)},   {16*8,  64}, 1},
-    {{4|(9<<4)},   {16*9,  64}, 1},
-    {{4|(10<<4)},  {16*10,  64}, 1},
-    {{4|(11<<4)},  {16*11,  64}, 1},
-};
 void suspend_power_down_kb(void)
 {

diff --git a/keyboards/dztech/dz65rgb/dz65rgb.c b/keyboards/dztech/dz65rgb/dz65rgb.c index 78b345843..e14943d97 100644 --- a/keyboards/dztech/dz65rgb/dz65rgb.c +++ b/keyboards/dztech/dz65rgb/dz65rgb.c
@@ -73,76 +73,26 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
73	{1, C9_16, C7_15, C6_15}, // LD16	73	{1, C9_16, C7_15, C6_15}, // LD16
74	{1, C8_16, C7_16, C6_16}, // LD17	74	{1, C8_16, C7_16, C6_16}, // LD17
75	};	75	};
76	rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {	76
77	{{1\|(7<<4)}, {16*7, 16}, 4},	77	led_config_t g_led_config = { {
78	{{1\|(6<<4)}, {16*6, 16}, 4},	78	{ 17, 16, 15, 14, 13, 12, 11, 10, 9, 18, 19, 20, 21, 22, 23 },
79	{{1\|(5<<4)}, {16*5, 16}, 4},	79	{ 7, 6, 5, 4, 3, 2, 1, 0, 26, 27, 28, 29, 30, 31, 24 },
80	{{1\|(4<<4)}, {16*4, 16}, 4},	80	{ 8, 48, 47, 46, 45, 44, 43, 51, 52, 53, 54, 55, NO_LED, 56, 25 },
81	{{1\|(3<<4)}, {16*3, 16}, 4},	81	{ 49, 40, 39, 38, 37, 36, 60, 61, 62, 63, 57, 58, NO_LED, 59, 32 },
82	{{1\|(2<<4)}, {16*2, 16}, 4},	82	{ 50, 42, 41, NO_LED, NO_LED, 35, NO_LED, NO_LED, 64, 65, 66, 67, NO_LED, 34, 33 }
83	{{1\|(1<<4)}, {16*1, 16}, 4},	83	}, {
84	{{1\|(0<<4)}, {16*0, 16}, 1},	84	{ 112, 16 }, { 96, 16 }, { 80, 16 }, { 64, 16 }, { 48, 16 }, { 32, 16 }, { 16, 16 }, { 0, 16 }, { 0, 32 }, { 128, 0 }, { 112, 0 }, { 96, 0 }, { 80, 0 }, { 64, 0 }, { 48, 0 },
85	{{2\|(0<<4)}, {16*0, 32}, 1},	85	{ 32, 0 }, { 16, 0 }, { 0, 0 }, { 144, 0 }, { 160, 0 }, { 176, 0 }, { 192, 0 }, { 208, 0 }, { 224, 0 }, { 224, 16 }, { 224, 32 }, { 128, 16 }, { 144, 16 }, { 160, 16 }, { 176, 16 },
86	{{0\|(8<<4)}, {16*8, 0}, 1},	86	{ 192, 16 }, { 208, 16 }, { 224, 48 }, { 224, 64 }, { 208, 64 }, { 80, 64 }, { 80, 48 }, { 64, 48 }, { 48, 48 }, { 32, 48 }, { 16, 48 }, { 32, 64 }, { 16, 64 }, { 96, 32 }, { 80, 32 },
87	{{0\|(7<<4)}, {16*7, 0}, 1},	87	{ 64, 32 }, { 48, 32 }, { 32, 32 }, { 16, 32 }, { 0, 48 }, { 0, 64 }, { 112, 32 }, { 128, 32 }, { 144, 32 }, { 160, 32 }, { 176, 32 }, { 208, 32 }, { 160, 48 }, { 176, 48 }, { 208, 48 },
88	{{0\|(6<<4)}, {16*6, 0}, 1},	88	{ 96, 48 }, { 112, 48 }, { 128, 48 }, { 144, 48 }, { 128, 64 }, { 144, 64 }, { 160, 64 }, { 176, 64 }
89	{{0\|(5<<4)}, {16*5, 0}, 1},	89	}, {
90	{{0\|(4<<4)}, {16*4, 0}, 1},	90	4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
91	{{0\|(3<<4)}, {16*3, 0}, 1},	91	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 4,
92	{{0\|(2<<4)}, {16*2, 0}, 1},	92	4, 4, 1, 1, 1, 1, 4, 4, 4, 4, 4, 1, 1, 4, 4,
93	{{0\|(1<<4)}, {16*1, 0}, 1},	93	4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4,
94	{{0\|(0<<4)}, {16*0, 0}, 1},	94	4, 4, 4, 4, 1, 1, 1, 1
95	{{0\|(9<<4)}, {16*9, 0}, 1},	95	} };
96	{{0\|(10<<4)}, {16*10, 0}, 1},
97	{{0\|(11<<4)}, {16*11, 0}, 1},
98	{{0\|(12<<4)}, {16*12, 0}, 1},
99	{{0\|(13<<4)}, {16*13, 0}, 1},
100	{{0\|(14<<4)}, {16*14, 0}, 1},
101	{{1\|(14<<4)}, {16*14, 16}, 1},
102	{{2\|(14<<4)}, {16*14, 32}, 1},
103	{{1\|(8<<4)}, {16*8, 16}, 4},
104	{{1\|(9<<4)}, {16*9, 16}, 4},
105	{{1\|(10<<4)}, {16*10, 16}, 4},
106	{{1\|(11<<4)}, {16*11, 16}, 4},
107	{{1\|(12<<4)}, {16*12, 16}, 4},
108	{{1\|(13<<4)}, {16*13, 16}, 4},
109	{{3\|(14<<4)}, {16*14, 48}, 1},
110	{{4\|(14<<4)}, {16*14, 64}, 1},
111	{{4\|(13<<4)}, {16*13, 64}, 1},
112	{{4\|(5<<4)}, {16*5, 64}, 1},
113	{{3\|(5<<4)}, {16*5, 48}, 4},
114	{{3\|(4<<4)}, {16*4, 48}, 4},
115	{{3\|(3<<4)}, {16*3, 48}, 4},
116	{{3\|(2<<4)}, {16*2, 48}, 4},
117	{{3\|(1<<4)}, {16*1, 48}, 4},
118	{{4\|(2<<4)}, {16*2, 64}, 1},
119	{{4\|(1<<4)}, {16*1, 64}, 1},
120	{{2\|(6<<4)}, {16*6, 32}, 4},
121	{{2\|(5<<4)}, {16*5, 32}, 4},
122	{{2\|(4<<4)}, {16*4, 32}, 4},
123	{{2\|(3<<4)}, {16*3, 32}, 4},
124	{{2\|(2<<4)}, {16*2, 32}, 4},
125	{{2\|(1<<4)}, {16*1, 32}, 4},
126	{{3\|(0<<4)}, {16*0, 48}, 1},
127	{{4\|(0<<4)}, {16*0, 64}, 1},
128	{{2\|(7<<4)}, {16*7, 32}, 4},
129	{{2\|(8<<4)}, {16*8, 32}, 4},
130	{{2\|(9<<4)}, {16*9, 32}, 4},
131	{{2\|(10<<4)}, {16*10, 32}, 4},
132	{{2\|(11<<4)}, {16*11, 32}, 4},
133	{{2\|(13<<4)}, {16*13, 32}, 4},
134	{{3\|(10<<4)}, {16*10, 48}, 4},
135	{{3\|(11<<4)}, {16*11, 48}, 4},
136	{{3\|(13<<4)}, {16*13, 48}, 4},
137	{{3\|(6<<4)}, {16*6, 48}, 4},
138	{{3\|(7<<4)}, {16*7, 48}, 4},
139	{{3\|(8<<4)}, {16*8, 48}, 4},
140	{{3\|(9<<4)}, {16*9, 48}, 4},
141	{{4\|(8<<4)}, {16*8, 64}, 1},
142	{{4\|(9<<4)}, {16*9, 64}, 1},
143	{{4\|(10<<4)}, {16*10, 64}, 1},
144	{{4\|(11<<4)}, {16*11, 64}, 1},
145	};
146		96
147	void suspend_power_down_kb(void)	97	void suspend_power_down_kb(void)
148	{	98	{