aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c120
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c170
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c154
-rwxr-xr-xkeyboards/kbdfans/kbd67/mkiirgb/v3/v3.c94
4 files changed, 198 insertions, 340 deletions
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c b/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c
index 5b50b51bd..7a105ae54 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c
@@ -13,123 +13,5 @@
13 * You should have received a copy of the GNU General Public License 13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16
17#include "mkiirgb.h"
18#ifdef RGB_MATRIX_ENABLE
19const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
20
21 {0, C8_8, C7_8, C6_8}, // LA17
22 {0, C9_8, C7_7, C6_7}, // LA16
23 {0, C9_7, C8_7, C6_6}, // LA15
24 {0, C9_6, C8_6, C7_6}, // LA14
25 {0, C9_5, C8_5, C7_5}, // LA13
26 {0, C9_4, C8_4, C7_4}, // LA12
27 {0, C9_3, C8_3, C7_3}, // LA11
28 {0, C9_2, C8_2, C7_2}, // LA10
29 {0, C9_1, C8_1, C7_1}, // LA9
30 {0, C2_9, C3_9, C4_9}, // LB0
31 {0, C1_9, C3_10, C4_10}, // LB1
32 {0, C1_10, C2_10, C4_11}, // LB2
33 {0, C1_11, C2_11, C3_11}, // LB3
34 {0, C1_13, C2_13, C3_13}, // LB5
35 {0, C1_14, C2_14, C3_14}, // LB6
36
37 {0, C1_7, C2_7, C3_7}, // LA7
38 {0, C1_6, C2_6, C3_6}, // LA6
39 {0, C1_5, C2_5, C3_5}, // LA5
40 {0, C1_4, C2_4, C3_4}, // LA4
41 {0, C1_3, C2_3, C3_3}, // LA3
42 {0, C1_2, C2_2, C4_3}, // LA2
43 {0, C1_1, C3_2, C4_2}, // LA1
44 {0, C2_1, C3_1, C4_1}, // LA0
45 {0, C9_9, C8_9, C7_9}, // LB9
46 {0, C9_10, C8_10, C7_10}, // LB10
47 {0, C9_11, C8_11, C7_11}, // LB11
48 {0, C9_12, C8_12, C7_12}, // LB12
49 {0, C9_13, C8_13, C7_13}, // LB13
50 {0, C9_14, C8_14, C7_14}, // LB14
51 {0, C1_15, C2_15, C3_15}, // LB7
52
53 {0, C1_8, C2_8, C3_8}, // LA8
54 {1, C9_6, C8_6, C7_6}, // LC14
55 {1, C9_5, C8_5, C7_5}, // LC13
56 {1, C9_4, C8_4, C7_4}, // LC12
57 {1, C9_3, C8_3, C7_3}, // LC11
58 {1, C9_2, C8_2, C7_2}, // LC10
59 {1, C9_1, C8_1, C7_1}, // LC9
60 {1, C2_9, C3_9, C4_9}, // LD0
61 {1, C1_9, C3_10, C4_10}, // LD1
62 {1, C1_10, C2_10, C4_11}, // LD2
63 {1, C1_11, C2_11, C3_11}, // LD3
64 {1, C1_12, C2_12, C3_12}, // LD4
65 {1, C1_13, C2_13, C3_13}, // LD5
66 {0, C1_16, C2_16, C3_16}, // LB8
67
68 {1, C9_8, C7_7, C6_7}, // LC16
69 {1, C1_5, C2_5, C3_5}, // LC5
70 {1, C1_4, C2_4, C3_4}, // LC4
71 {1, C1_3, C2_3, C3_3}, // LC3
72 {1, C1_2, C2_2, C4_3}, // LC2
73 {1, C1_1, C3_2, C4_2}, // LC1
74 {1, C9_9, C8_9, C7_9}, // LD9
75 {1, C9_10, C8_10, C7_10}, // LD10
76 {1, C9_11, C8_11, C7_11}, // LD11
77 {1, C9_12, C8_12, C7_12}, // LD12
78 {1, C1_14, C2_14, C3_14}, // LD6
79 {1, C1_15, C2_15, C3_15}, // LD7
80 {1, C1_16, C2_16, C3_16}, // LD8
81 {0, C9_15, C8_15, C6_14}, // LB15
82
83 {1, C8_8, C7_8, C6_8}, // LC17
84 {1, C1_8, C2_8, C3_8}, // LC8
85 {1, C1_7, C2_7, C3_7}, // LC7
86 {1, C2_1, C3_1, C4_1}, // LC0
87 {1, C9_14, C8_14, C7_14}, // LD14
88 {1, C9_15, C8_15, C6_14}, // LD15
89 {1, C8_16, C7_16, C6_16}, // LD17
90 {0, C8_16, C7_16, C6_16}, // LB17
91 {0, C9_16, C7_15, C6_15}, // LB16
92
93};
94 16
95led_config_t g_led_config = { { 17#include "mkiirgb.h"
96 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 },
97 { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 },
98 { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, NO_LED,42, 43 },
99 { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED,56, 57 },
100 { 58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, 62, NO_LED, 63, 64, NO_LED, 65, 66 }
101}, {
102 {0,0},{15,0},{30,0},{45,0},{60,0},{75,0},{90,0},{105,0},{120,0},{135,0},{150,0},{165,0},{180,0},{203,0},{224,0},
103 {4,16},{23,16},{38,16},{53,16},{68,16},{83,16},{98,16},{113,16},{128,16},{143,16},{158,16},{173,16},{188,16},{206,16},{224,16},
104 {6,32},{26,32},{41,32},{56,32},{71,32},{86,32},{101,32},{116,32},{131,32},{146,32},{161,32},{176,32},{201,32},{224,32},
105 {9,48},{34,48},{49,48},{64,48},{79,48},{94,48},{109,48},{124,48},{139,48},{154,48},{169,48},{189,48},{210,48},{224,48},
106 {2,64},{21,64},{39,64},{96,64},{152,64},{171,64},{195,64},{210,64},{224,64}
107}, {
108 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
109 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
110 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
111 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
112 1, 1, 1, 4, 1, 1, 1, 1, 1
113} };
114
115void suspend_power_down_kb(void)
116{
117 rgb_matrix_set_suspend_state(true);
118 suspend_power_down_user();
119}
120
121void suspend_wakeup_init_kb(void)
122{
123 rgb_matrix_set_suspend_state(false);
124 suspend_wakeup_init_user();
125}
126
127__attribute__ ((weak))
128void rgb_matrix_indicators_user(void)
129{
130 if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK))
131 {
132 rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
133 }
134}
135#endif
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c b/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c
index 466b0148a..53b57dc73 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c
@@ -16,108 +16,88 @@
16 16
17#include "v1.h" 17#include "v1.h"
18#ifdef RGB_MATRIX_ENABLE 18#ifdef RGB_MATRIX_ENABLE
19const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { 19const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
20
21 {0, C8_8, C7_8, C6_8}, // LA17
22 {0, C9_8, C7_7, C6_7}, // LA16
23 {0, C9_7, C8_7, C6_6}, // LA15
24 {0, C9_6, C8_6, C7_6}, // LA14
25 {0, C9_5, C8_5, C7_5}, // LA13
26 {0, C9_4, C8_4, C7_4}, // LA12
27 {0, C9_3, C8_3, C7_3}, // LA11
28 {0, C9_2, C8_2, C7_2}, // LA10
29 {0, C9_1, C8_1, C7_1}, // LA9
30 {0, C2_9, C3_9, C4_9}, // LB0
31 {0, C1_9, C3_10, C4_10}, // LB1
32 {0, C1_10, C2_10, C4_11}, // LB2
33 {0, C1_11, C2_11, C3_11}, // LB3
34 {0, C1_13, C2_13, C3_13}, // LB5
35 {0, C1_14, C2_14, C3_14}, // LB6
36
37 {0, C1_7, C2_7, C3_7}, // LA7
38 {0, C1_6, C2_6, C3_6}, // LA6
39 {0, C1_5, C2_5, C3_5}, // LA5
40 {0, C1_4, C2_4, C3_4}, // LA4
41 {0, C1_3, C2_3, C3_3}, // LA3
42 {0, C1_2, C2_2, C4_3}, // LA2
43 {0, C1_1, C3_2, C4_2}, // LA1
44 {0, C2_1, C3_1, C4_1}, // LA0
45 {0, C9_9, C8_9, C7_9}, // LB9
46 {0, C9_10, C8_10, C7_10}, // LB10
47 {0, C9_11, C8_11, C7_11}, // LB11
48 {0, C9_12, C8_12, C7_12}, // LB12
49 {0, C9_13, C8_13, C7_13}, // LB13
50 {0, C9_14, C8_14, C7_14}, // LB14
51 {0, C1_15, C2_15, C3_15}, // LB7
52 20
53 {0, C1_8, C2_8, C3_8}, // LA8 21 {0, C8_8, C7_8, C6_8}, // LA17
54 {1, C9_6, C8_6, C7_6}, // LC14 22 {0, C9_8, C7_7, C6_7}, // LA16
55 {1, C9_5, C8_5, C7_5}, // LC13 23 {0, C9_7, C8_7, C6_6}, // LA15
56 {1, C9_4, C8_4, C7_4}, // LC12 24 {0, C9_6, C8_6, C7_6}, // LA14
57 {1, C9_3, C8_3, C7_3}, // LC11 25 {0, C9_5, C8_5, C7_5}, // LA13
58 {1, C9_2, C8_2, C7_2}, // LC10 26 {0, C9_4, C8_4, C7_4}, // LA12
59 {1, C9_1, C8_1, C7_1}, // LC9 27 {0, C9_3, C8_3, C7_3}, // LA11
60 {1, C2_9, C3_9, C4_9}, // LD0 28 {0, C9_2, C8_2, C7_2}, // LA10
61 {1, C1_9, C3_10, C4_10}, // LD1 29 {0, C9_1, C8_1, C7_1}, // LA9
62 {1, C1_10, C2_10, C4_11}, // LD2 30 {0, C2_9, C3_9, C4_9}, // LB0
63 {1, C1_11, C2_11, C3_11}, // LD3 31 {0, C1_9, C3_10, C4_10}, // LB1
64 {1, C1_12, C2_12, C3_12}, // LD4 32 {0, C1_10, C2_10, C4_11}, // LB2
65 {1, C1_13, C2_13, C3_13}, // LD5 33 {0, C1_11, C2_11, C3_11}, // LB3
66 {0, C1_16, C2_16, C3_16}, // LB8 34 {0, C1_13, C2_13, C3_13}, // LB5
35 {0, C1_14, C2_14, C3_14}, // LB6
67 36
68 {1, C9_8, C7_7, C6_7}, // LC16 37 {0, C1_7, C2_7, C3_7}, // LA7
69 {1, C1_5, C2_5, C3_5}, // LC5 38 {0, C1_6, C2_6, C3_6}, // LA6
70 {1, C1_4, C2_4, C3_4}, // LC4 39 {0, C1_5, C2_5, C3_5}, // LA5
71 {1, C1_3, C2_3, C3_3}, // LC3 40 {0, C1_4, C2_4, C3_4}, // LA4
72 {1, C1_2, C2_2, C4_3}, // LC2 41 {0, C1_3, C2_3, C3_3}, // LA3
73 {1, C1_1, C3_2, C4_2}, // LC1 42 {0, C1_2, C2_2, C4_3}, // LA2
74 {1, C9_9, C8_9, C7_9}, // LD9 43 {0, C1_1, C3_2, C4_2}, // LA1
75 {1, C9_10, C8_10, C7_10}, // LD10 44 {0, C2_1, C3_1, C4_1}, // LA0
76 {1, C9_11, C8_11, C7_11}, // LD11 45 {0, C9_9, C8_9, C7_9}, // LB9
77 {1, C9_12, C8_12, C7_12}, // LD12 46 {0, C9_10, C8_10, C7_10}, // LB10
78 {1, C1_14, C2_14, C3_14}, // LD6 47 {0, C9_11, C8_11, C7_11}, // LB11
79 {1, C1_15, C2_15, C3_15}, // LD7 48 {0, C9_12, C8_12, C7_12}, // LB12
80 {1, C1_16, C2_16, C3_16}, // LD8 49 {0, C9_13, C8_13, C7_13}, // LB13
81 {0, C9_15, C8_15, C6_14}, // LB15 50 {0, C9_14, C8_14, C7_14}, // LB14
51 {0, C1_15, C2_15, C3_15}, // LB7
82 52
83 {1, C8_8, C7_8, C6_8}, // LC17 53 {0, C1_8, C2_8, C3_8}, // LA8
84 {1, C1_8, C2_8, C3_8}, // LC8 54 {1, C9_6, C8_6, C7_6}, // LC14
85 {1, C1_7, C2_7, C3_7}, // LC7 55 {1, C9_5, C8_5, C7_5}, // LC13
86 {1, C2_1, C3_1, C4_1}, // LC0 56 {1, C9_4, C8_4, C7_4}, // LC12
87 {1, C9_14, C8_14, C7_14}, // LD14 57 {1, C9_3, C8_3, C7_3}, // LC11
88 {1, C9_15, C8_15, C6_14}, // LD15 58 {1, C9_2, C8_2, C7_2}, // LC10
89 {1, C8_16, C7_16, C6_16}, // LD17 59 {1, C9_1, C8_1, C7_1}, // LC9
90 {0, C8_16, C7_16, C6_16}, // LB17 60 {1, C2_9, C3_9, C4_9}, // LD0
91 {0, C9_16, C7_15, C6_15}, // LB16 61 {1, C1_9, C3_10, C4_10}, // LD1
62 {1, C1_10, C2_10, C4_11}, // LD2
63 {1, C1_11, C2_11, C3_11}, // LD3
64 {1, C1_12, C2_12, C3_12}, // LD4
65 {1, C1_13, C2_13, C3_13}, // LD5
66 {0, C1_16, C2_16, C3_16}, // LB8
92 67
93}; 68 {1, C9_8, C7_7, C6_7}, // LC16
69 {1, C1_5, C2_5, C3_5}, // LC5
70 {1, C1_4, C2_4, C3_4}, // LC4
71 {1, C1_3, C2_3, C3_3}, // LC3
72 {1, C1_2, C2_2, C4_3}, // LC2
73 {1, C1_1, C3_2, C4_2}, // LC1
74 {1, C9_9, C8_9, C7_9}, // LD9
75 {1, C9_10, C8_10, C7_10}, // LD10
76 {1, C9_11, C8_11, C7_11}, // LD11
77 {1, C9_12, C8_12, C7_12}, // LD12
78 {1, C1_14, C2_14, C3_14}, // LD6
79 {1, C1_15, C2_15, C3_15}, // LD7
80 {1, C1_16, C2_16, C3_16}, // LD8
81 {0, C9_15, C8_15, C6_14}, // LB15
82
83 {1, C8_8, C7_8, C6_8}, // LC17
84 {1, C1_8, C2_8, C3_8}, // LC8
85 {1, C1_7, C2_7, C3_7}, // LC7
86 {1, C2_1, C3_1, C4_1}, // LC0
87 {1, C9_14, C8_14, C7_14}, // LD14
88 {1, C9_15, C8_15, C6_14}, // LD15
89 {1, C8_16, C7_16, C6_16}, // LD17
90 {0, C8_16, C7_16, C6_16}, // LB17
91 {0, C9_16, C7_15, C6_15}, // LB16
94 92
95led_config_t g_led_config = { { 93};
96 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 },
97 { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 },
98 { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, NO_LED,42, 43 },
99 { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED,56, 57 },
100 { 58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, 62, NO_LED, 63, 64, NO_LED, 65, 66 }
101}, {
102 {0,0},{15,0},{30,0},{45,0},{60,0},{75,0},{90,0},{105,0},{120,0},{135,0},{150,0},{165,0},{180,0},{203,0},{224,0},
103 {4,16},{23,16},{38,16},{53,16},{68,16},{83,16},{98,16},{113,16},{128,16},{143,16},{158,16},{173,16},{188,16},{206,16},{224,16},
104 {6,32},{26,32},{41,32},{56,32},{71,32},{86,32},{101,32},{116,32},{131,32},{146,32},{161,32},{176,32},{201,32},{224,32},
105 {9,48},{34,48},{49,48},{64,48},{79,48},{94,48},{109,48},{124,48},{139,48},{154,48},{169,48},{189,48},{210,48},{224,48},
106 {2,64},{21,64},{39,64},{96,64},{152,64},{171,64},{195,64},{210,64},{224,64}
107}, {
108 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
109 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
110 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
111 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
112 1, 1, 1, 4, 1, 1, 1, 1, 1
113} };
114 94
95led_config_t g_led_config = {{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14}, {15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29}, {30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, NO_LED, 42, 43}, {44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED, 56, 57}, {58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, 62, NO_LED, 63, 64, NO_LED, 65, 66}},
96 {{0, 0}, {15, 0}, {30, 0}, {45, 0}, {60, 0}, {75, 0}, {90, 0}, {105, 0}, {120, 0}, {135, 0}, {150, 0}, {165, 0}, {180, 0}, {203, 0}, {224, 0}, {4, 16}, {23, 16}, {38, 16}, {53, 16}, {68, 16}, {83, 16}, {98, 16}, {113, 16}, {128, 16}, {143, 16}, {158, 16}, {173, 16}, {188, 16}, {206, 16}, {224, 16}, {6, 32}, {26, 32}, {41, 32}, {56, 32}, {71, 32}, {86, 32}, {101, 32}, {116, 32}, {131, 32}, {146, 32}, {161, 32}, {176, 32}, {201, 32}, {224, 32}, {9, 48}, {34, 48}, {49, 48}, {64, 48}, {79, 48}, {94, 48}, {109, 48}, {124, 48}, {139, 48}, {154, 48}, {169, 48}, {189, 48}, {210, 48}, {224, 48}, {2, 64}, {21, 64}, {39, 64}, {96, 64}, {152, 64}, {171, 64}, {195, 64}, {210, 64}, {224, 64}},
97 {1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 4, 1, 1, 1, 1, 1}};
115 98
116__attribute__ ((weak)) 99__attribute__((weak)) void rgb_matrix_indicators_user(void) {
117void rgb_matrix_indicators_user(void) 100 if (host_keyboard_led_state().caps_lock) {
118{
119 if (host_keyboard_led_state().caps_lock)
120 {
121 rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF); 101 rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
122 } 102 }
123} 103}
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c b/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c
index 951dd028f..562b9c454 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c
@@ -16,79 +16,79 @@
16 16
17#include "v2.h" 17#include "v2.h"
18#ifdef RGB_MATRIX_ENABLE 18#ifdef RGB_MATRIX_ENABLE
19const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { 19const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
20 20
21 {0, C8_8, C7_8, C6_8}, // LA17 21 {0, C8_8, C7_8, C6_8}, // LA17
22 {0, C9_8, C7_7, C6_7}, // LA16 22 {0, C9_8, C7_7, C6_7}, // LA16
23 {0, C9_7, C8_7, C6_6}, // LA15 23 {0, C9_7, C8_7, C6_6}, // LA15
24 {0, C9_6, C8_6, C7_6}, // LA14 24 {0, C9_6, C8_6, C7_6}, // LA14
25 {0, C9_5, C8_5, C7_5}, // LA13 25 {0, C9_5, C8_5, C7_5}, // LA13
26 {0, C9_4, C8_4, C7_4}, // LA12 26 {0, C9_4, C8_4, C7_4}, // LA12
27 {0, C9_3, C8_3, C7_3}, // LA11 27 {0, C9_3, C8_3, C7_3}, // LA11
28 {0, C9_2, C8_2, C7_2}, // LA10 28 {0, C9_2, C8_2, C7_2}, // LA10
29 {0, C9_1, C8_1, C7_1}, // LA9 29 {0, C9_1, C8_1, C7_1}, // LA9
30 {0, C2_9, C3_9, C4_9}, // LB0 30 {0, C2_9, C3_9, C4_9}, // LB0
31 {0, C1_9, C3_10, C4_10}, // LB1 31 {0, C1_9, C3_10, C4_10}, // LB1
32 {0, C1_10, C2_10, C4_11}, // LB2 32 {0, C1_10, C2_10, C4_11}, // LB2
33 {0, C1_11, C2_11, C3_11}, // LB3 33 {0, C1_11, C2_11, C3_11}, // LB3
34 {0, C1_13, C2_13, C3_13}, // LB5 34 {0, C1_13, C2_13, C3_13}, // LB5
35 {0, C1_14, C2_14, C3_14}, // LB6 35 {0, C1_14, C2_14, C3_14}, // LB6
36 36
37 {0, C1_7, C2_7, C3_7}, // LA7 37 {0, C1_7, C2_7, C3_7}, // LA7
38 {0, C1_6, C2_6, C3_6}, // LA6 38 {0, C1_6, C2_6, C3_6}, // LA6
39 {0, C1_5, C2_5, C3_5}, // LA5 39 {0, C1_5, C2_5, C3_5}, // LA5
40 {0, C1_4, C2_4, C3_4}, // LA4 40 {0, C1_4, C2_4, C3_4}, // LA4
41 {0, C1_3, C2_3, C3_3}, // LA3 41 {0, C1_3, C2_3, C3_3}, // LA3
42 {0, C1_2, C2_2, C4_3}, // LA2 42 {0, C1_2, C2_2, C4_3}, // LA2
43 {0, C1_1, C3_2, C4_2}, // LA1 43 {0, C1_1, C3_2, C4_2}, // LA1
44 {0, C2_1, C3_1, C4_1}, // LA0 44 {0, C2_1, C3_1, C4_1}, // LA0
45 {0, C9_9, C8_9, C7_9}, // LB9 45 {0, C9_9, C8_9, C7_9}, // LB9
46 {0, C9_10, C8_10, C7_10}, // LB10 46 {0, C9_10, C8_10, C7_10}, // LB10
47 {0, C9_11, C8_11, C7_11}, // LB11 47 {0, C9_11, C8_11, C7_11}, // LB11
48 {0, C9_12, C8_12, C7_12}, // LB12 48 {0, C9_12, C8_12, C7_12}, // LB12
49 {0, C9_13, C8_13, C7_13}, // LB13 49 {0, C9_13, C8_13, C7_13}, // LB13
50 {0, C9_14, C8_14, C7_14}, // LB14 50 {0, C9_14, C8_14, C7_14}, // LB14
51 {0, C1_15, C2_15, C3_15}, // LB7 51 {0, C1_15, C2_15, C3_15}, // LB7
52 52
53 {0, C1_8, C2_8, C3_8}, // LA8 53 {0, C1_8, C2_8, C3_8}, // LA8
54 {1, C9_6, C8_6, C7_6}, // LC14 54 {1, C9_6, C8_6, C7_6}, // LC14
55 {1, C9_5, C8_5, C7_5}, // LC13 55 {1, C9_5, C8_5, C7_5}, // LC13
56 {1, C9_4, C8_4, C7_4}, // LC12 56 {1, C9_4, C8_4, C7_4}, // LC12
57 {1, C9_3, C8_3, C7_3}, // LC11 57 {1, C9_3, C8_3, C7_3}, // LC11
58 {1, C9_2, C8_2, C7_2}, // LC10 58 {1, C9_2, C8_2, C7_2}, // LC10
59 {1, C9_1, C8_1, C7_1}, // LC9 59 {1, C9_1, C8_1, C7_1}, // LC9
60 {1, C2_9, C3_9, C4_9}, // LD0 60 {1, C2_9, C3_9, C4_9}, // LD0
61 {1, C1_9, C3_10, C4_10}, // LD1 61 {1, C1_9, C3_10, C4_10}, // LD1
62 {1, C1_10, C2_10, C4_11}, // LD2 62 {1, C1_10, C2_10, C4_11}, // LD2
63 {1, C1_11, C2_11, C3_11}, // LD3 63 {1, C1_11, C2_11, C3_11}, // LD3
64 {1, C1_12, C2_12, C3_12}, // LD4 64 {1, C1_12, C2_12, C3_12}, // LD4
65 {1, C1_13, C2_13, C3_13}, // LD5 65 {1, C1_13, C2_13, C3_13}, // LD5
66 {0, C1_16, C2_16, C3_16}, // LB8 66 {0, C1_16, C2_16, C3_16}, // LB8
67 67
68 {1, C9_8, C7_7, C6_7}, // LC16 68 {1, C9_8, C7_7, C6_7}, // LC16
69 {1, C1_5, C2_5, C3_5}, // LC5 69 {1, C1_5, C2_5, C3_5}, // LC5
70 {1, C1_4, C2_4, C3_4}, // LC4 70 {1, C1_4, C2_4, C3_4}, // LC4
71 {1, C1_3, C2_3, C3_3}, // LC3 71 {1, C1_3, C2_3, C3_3}, // LC3
72 {1, C1_2, C2_2, C4_3}, // LC2 72 {1, C1_2, C2_2, C4_3}, // LC2
73 {1, C1_1, C3_2, C4_2}, // LC1 73 {1, C1_1, C3_2, C4_2}, // LC1
74 {1, C9_9, C8_9, C7_9}, // LD9 74 {1, C9_9, C8_9, C7_9}, // LD9
75 {1, C9_10, C8_10, C7_10}, // LD10 75 {1, C9_10, C8_10, C7_10}, // LD10
76 {1, C9_11, C8_11, C7_11}, // LD11 76 {1, C9_11, C8_11, C7_11}, // LD11
77 {1, C9_12, C8_12, C7_12}, // LD12 77 {1, C9_12, C8_12, C7_12}, // LD12
78 {1, C1_14, C2_14, C3_14}, // LD6 78 {1, C1_14, C2_14, C3_14}, // LD6
79 {1, C1_15, C2_15, C3_15}, // LD7 79 {1, C1_15, C2_15, C3_15}, // LD7
80 {1, C1_16, C2_16, C3_16}, // LD8 80 {1, C1_16, C2_16, C3_16}, // LD8
81 {0, C9_15, C8_15, C6_14}, // LB15 81 {0, C9_15, C8_15, C6_14}, // LB15
82 82
83 {1, C8_8, C7_8, C6_8}, // LC17 83 {1, C8_8, C7_8, C6_8}, // LC17
84 {1, C1_8, C2_8, C3_8}, // LC8 84 {1, C1_8, C2_8, C3_8}, // LC8
85 {1, C1_7, C2_7, C3_7}, // LC7 85 {1, C1_7, C2_7, C3_7}, // LC7
86 {1, C2_1, C3_1, C4_1}, // LC0 86 {1, C2_1, C3_1, C4_1}, // LC0
87 {1, C9_14, C8_14, C7_14}, // LD14 87 {1, C9_14, C8_14, C7_14}, // LD14
88 {1, C9_15, C8_15, C6_14}, // LD15 88 {1, C9_15, C8_15, C6_14}, // LD15
89 {1, C8_16, C7_16, C6_16}, // LD17 89 {1, C8_16, C7_16, C6_16}, // LD17
90 {0, C8_16, C7_16, C6_16}, // LB17 90 {0, C8_16, C7_16, C6_16}, // LB17
91 {0, C9_16, C7_15, C6_15}, // LB16 91 {0, C9_16, C7_15, C6_15}, // LB16
92 92
93}; 93};
94 94
@@ -100,24 +100,22 @@ led_config_t g_led_config = { {
100 { 58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, 62, NO_LED, 63, 64, NO_LED, 65, 66 } 100 { 58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, 62, NO_LED, 63, 64, NO_LED, 65, 66 }
101}, { 101}, {
102 {0,0},{15,0},{30,0},{45,0},{60,0},{75,0},{90,0},{105,0},{120,0},{135,0},{150,0},{165,0},{180,0},{203,0},{224,0}, 102 {0,0},{15,0},{30,0},{45,0},{60,0},{75,0},{90,0},{105,0},{120,0},{135,0},{150,0},{165,0},{180,0},{203,0},{224,0},
103 {4,16},{23,16},{38,16},{53,16},{68,16},{83,16},{98,16},{113,16},{128,16},{143,16},{158,16},{173,16},{188,16},{206,16},{224,16}, 103 {4,16},{23,16},{38,16},{53,16},{68,16},{83,16},{98,16},{113,16},{128,16},{143,16},{158,16},{173,16},{188,16},{206,16},{224,16},
104 {6,32},{26,32},{41,32},{56,32},{71,32},{86,32},{101,32},{116,32},{131,32},{146,32},{161,32},{176,32},{201,32},{224,32}, 104 {6,32},{26,32},{41,32},{56,32},{71,32},{86,32},{101,32},{116,32},{131,32},{146,32},{161,32},{176,32},{201,32},{224,32},
105 {9,48},{34,48},{49,48},{64,48},{79,48},{94,48},{109,48},{124,48},{139,48},{154,48},{169,48},{189,48},{210,48},{224,48}, 105 {9,48},{34,48},{49,48},{64,48},{79,48},{94,48},{109,48},{124,48},{139,48},{154,48},{169,48},{189,48},{210,48},{224,48},
106 {2,64},{21,64},{39,64},{96,64},{152,64},{171,64},{195,64},{210,64},{224,64} 106 {2,64},{21,64},{39,64},{96,64},{152,64},{171,64},{195,64},{210,64},{224,64}
107}, { 107}, {
108 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 108 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
109 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 109 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
110 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 110 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
111 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 111 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
112 1, 1, 1, 4, 1, 1, 1, 1, 1 112 1, 1, 1, 4, 1, 1, 1, 1, 1
113} }; 113} };
114 114
115 115
116__attribute__ ((weak)) 116__attribute__ ((weak))
117void rgb_matrix_indicators_user(void) 117void rgb_matrix_indicators_user(void) {
118{ 118 if (host_keyboard_led_state().caps_lock) {
119 if (host_keyboard_led_state().caps_lock)
120 {
121 rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF); 119 rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
122 } 120 }
123} 121}
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
index a082f36ba..5a0835dbc 100755
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
@@ -18,80 +18,80 @@
18 18
19#ifdef RGB_MATRIX_ENABLE 19#ifdef RGB_MATRIX_ENABLE
20 20
21const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { 21const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
22 {0, CS21_SW1, CS20_SW1, CS19_SW1}, 22 {0, CS21_SW1, CS20_SW1, CS19_SW1},
23 {0, CS21_SW2, CS20_SW2, CS19_SW2}, 23 {0, CS21_SW2, CS20_SW2, CS19_SW2},
24 {0, CS21_SW3, CS20_SW3, CS19_SW3}, 24 {0, CS21_SW3, CS20_SW3, CS19_SW3},
25 {0, CS21_SW4, CS20_SW4, CS19_SW4}, 25 {0, CS21_SW4, CS20_SW4, CS19_SW4},
26 {0, CS21_SW5, CS20_SW5, CS19_SW5}, 26 {0, CS21_SW5, CS20_SW5, CS19_SW5},
27 {0, CS21_SW6, CS20_SW6, CS19_SW6}, 27 {0, CS21_SW6, CS20_SW6, CS19_SW6},
28 {0, CS21_SW7, CS20_SW7, CS19_SW7}, 28 {0, CS21_SW7, CS20_SW7, CS19_SW7},
29 {0, CS21_SW8, CS20_SW8, CS19_SW8}, 29 {0, CS21_SW8, CS20_SW8, CS19_SW8},
30 {0, CS24_SW1, CS23_SW1, CS22_SW1}, 30 {0, CS24_SW1, CS23_SW1, CS22_SW1},
31 {0, CS24_SW2, CS23_SW2, CS22_SW2}, 31 {0, CS24_SW2, CS23_SW2, CS22_SW2},
32 {0, CS24_SW3, CS23_SW3, CS22_SW3}, 32 {0, CS24_SW3, CS23_SW3, CS22_SW3},
33 {0, CS24_SW4, CS23_SW4, CS22_SW4}, 33 {0, CS24_SW4, CS23_SW4, CS22_SW4},
34 {0, CS24_SW5, CS23_SW5, CS22_SW5}, 34 {0, CS24_SW5, CS23_SW5, CS22_SW5},
35 {0, CS24_SW6, CS23_SW6, CS22_SW6}, 35 {0, CS24_SW6, CS23_SW6, CS22_SW6},
36 {0, CS24_SW7, CS23_SW7, CS22_SW7}, 36 {0, CS24_SW7, CS23_SW7, CS22_SW7},
37 37
38 {0, CS15_SW1, CS14_SW1, CS13_SW1}, 38 {0, CS15_SW1, CS14_SW1, CS13_SW1},
39 {0, CS15_SW2, CS14_SW2, CS13_SW2}, 39 {0, CS15_SW2, CS14_SW2, CS13_SW2},
40 {0, CS15_SW3, CS14_SW3, CS13_SW3}, 40 {0, CS15_SW3, CS14_SW3, CS13_SW3},
41 {0, CS15_SW4, CS14_SW4, CS13_SW4}, 41 {0, CS15_SW4, CS14_SW4, CS13_SW4},
42 {0, CS15_SW5, CS14_SW5, CS13_SW5}, 42 {0, CS15_SW5, CS14_SW5, CS13_SW5},
43 {0, CS15_SW6, CS14_SW6, CS13_SW6}, 43 {0, CS15_SW6, CS14_SW6, CS13_SW6},
44 {0, CS15_SW7, CS14_SW7, CS13_SW7}, 44 {0, CS15_SW7, CS14_SW7, CS13_SW7},
45 {0, CS15_SW8, CS14_SW8, CS13_SW8}, 45 {0, CS15_SW8, CS14_SW8, CS13_SW8},
46 {0, CS30_SW1, CS29_SW1, CS28_SW1}, 46 {0, CS30_SW1, CS29_SW1, CS28_SW1},
47 {0, CS30_SW2, CS29_SW2, CS28_SW2}, 47 {0, CS30_SW2, CS29_SW2, CS28_SW2},
48 {0, CS30_SW3, CS29_SW3, CS28_SW3}, 48 {0, CS30_SW3, CS29_SW3, CS28_SW3},
49 {0, CS30_SW4, CS29_SW4, CS28_SW4}, 49 {0, CS30_SW4, CS29_SW4, CS28_SW4},
50 {0, CS30_SW5, CS29_SW5, CS28_SW5}, 50 {0, CS30_SW5, CS29_SW5, CS28_SW5},
51 {0, CS30_SW6, CS29_SW6, CS28_SW6}, 51 {0, CS30_SW6, CS29_SW6, CS28_SW6},
52 {0, CS30_SW7, CS29_SW7, CS28_SW7}, 52 {0, CS30_SW7, CS29_SW7, CS28_SW7},
53 53
54 {0, CS12_SW1, CS11_SW1, CS10_SW1}, 54 {0, CS12_SW1, CS11_SW1, CS10_SW1},
55 {0, CS12_SW2, CS11_SW2, CS10_SW2}, 55 {0, CS12_SW2, CS11_SW2, CS10_SW2},
56 {0, CS12_SW3, CS11_SW3, CS10_SW3}, 56 {0, CS12_SW3, CS11_SW3, CS10_SW3},
57 {0, CS12_SW4, CS11_SW4, CS10_SW4}, 57 {0, CS12_SW4, CS11_SW4, CS10_SW4},
58 {0, CS12_SW5, CS11_SW5, CS10_SW5}, 58 {0, CS12_SW5, CS11_SW5, CS10_SW5},
59 {0, CS12_SW6, CS11_SW6, CS10_SW6}, 59 {0, CS12_SW6, CS11_SW6, CS10_SW6},
60 {0, CS12_SW7, CS11_SW7, CS10_SW7}, 60 {0, CS12_SW7, CS11_SW7, CS10_SW7},
61 {0, CS12_SW8, CS11_SW8, CS10_SW8}, 61 {0, CS12_SW8, CS11_SW8, CS10_SW8},
62 {0, CS33_SW1, CS32_SW1, CS31_SW1}, 62 {0, CS33_SW1, CS32_SW1, CS31_SW1},
63 {0, CS33_SW2, CS32_SW2, CS31_SW2}, 63 {0, CS33_SW2, CS32_SW2, CS31_SW2},
64 {0, CS33_SW3, CS32_SW3, CS31_SW3}, 64 {0, CS33_SW3, CS32_SW3, CS31_SW3},
65 {0, CS33_SW4, CS32_SW4, CS31_SW4}, 65 {0, CS33_SW4, CS32_SW4, CS31_SW4},
66 {0, CS33_SW5, CS32_SW5, CS31_SW5}, 66 {0, CS33_SW5, CS32_SW5, CS31_SW5},
67 {0, CS33_SW7, CS32_SW7, CS31_SW7}, 67 {0, CS33_SW7, CS32_SW7, CS31_SW7},
68 68
69 {0, CS9_SW1, CS8_SW1, CS7_SW1}, 69 {0, CS9_SW1, CS8_SW1, CS7_SW1},
70 {0, CS9_SW2, CS8_SW2, CS7_SW2}, 70 {0, CS9_SW2, CS8_SW2, CS7_SW2},
71 {0, CS9_SW3, CS8_SW3, CS7_SW3}, 71 {0, CS9_SW3, CS8_SW3, CS7_SW3},
72 {0, CS9_SW4, CS8_SW4, CS7_SW4}, 72 {0, CS9_SW4, CS8_SW4, CS7_SW4},
73 {0, CS9_SW5, CS8_SW5, CS7_SW5}, 73 {0, CS9_SW5, CS8_SW5, CS7_SW5},
74 {0, CS9_SW6, CS8_SW6, CS7_SW6}, 74 {0, CS9_SW6, CS8_SW6, CS7_SW6},
75 {0, CS9_SW7, CS8_SW7, CS7_SW7}, 75 {0, CS9_SW7, CS8_SW7, CS7_SW7},
76 {0, CS9_SW8, CS8_SW8, CS7_SW8}, 76 {0, CS9_SW8, CS8_SW8, CS7_SW8},
77 {0, CS36_SW1, CS35_SW1, CS34_SW1}, 77 {0, CS36_SW1, CS35_SW1, CS34_SW1},
78 {0, CS36_SW2, CS35_SW2, CS34_SW2}, 78 {0, CS36_SW2, CS35_SW2, CS34_SW2},
79 {0, CS36_SW3, CS35_SW3, CS34_SW3}, 79 {0, CS36_SW3, CS35_SW3, CS34_SW3},
80 {0, CS36_SW4, CS35_SW4, CS34_SW4}, 80 {0, CS36_SW4, CS35_SW4, CS34_SW4},
81 {0, CS36_SW5, CS35_SW5, CS34_SW5}, 81 {0, CS36_SW5, CS35_SW5, CS34_SW5},
82 {0, CS36_SW7, CS35_SW7, CS34_SW7}, 82 {0, CS36_SW7, CS35_SW7, CS34_SW7},
83 83
84 {0, CS3_SW1, CS2_SW1, CS1_SW1}, 84 {0, CS3_SW1, CS2_SW1, CS1_SW1},
85 {0, CS3_SW2, CS2_SW2, CS1_SW2}, 85 {0, CS3_SW2, CS2_SW2, CS1_SW2},
86 {0, CS3_SW3, CS2_SW3, CS1_SW3}, 86 {0, CS3_SW3, CS2_SW3, CS1_SW3},
87 {0, CS3_SW6, CS2_SW6, CS1_SW6}, 87 {0, CS3_SW6, CS2_SW6, CS1_SW6},
88// {0, CS39_SW1, CS38_SW1, CS37_SW1}, 88// {0, CS39_SW1, CS38_SW1, CS37_SW1},
89 {0, CS39_SW2, CS38_SW2, CS37_SW2}, 89 {0, CS39_SW2, CS38_SW2, CS37_SW2},
90 {0, CS39_SW3, CS38_SW3, CS37_SW3}, 90 {0, CS39_SW3, CS38_SW3, CS37_SW3},
91 {0, CS39_SW4, CS38_SW4, CS37_SW4}, 91 {0, CS39_SW4, CS38_SW4, CS37_SW4},
92 {0, CS39_SW5, CS38_SW5, CS37_SW5}, 92 {0, CS39_SW5, CS38_SW5, CS37_SW5},
93 {0, CS39_SW7, CS38_SW7, CS37_SW7} 93 {0, CS39_SW7, CS38_SW7, CS37_SW7}
94 94
95}; 95};
96led_config_t g_led_config = { { 96led_config_t g_led_config = { {
97 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 }, 97 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 },
@@ -109,17 +109,15 @@ led_config_t g_led_config = { {
109}, { 109}, {
110 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 110 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
111 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 111 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
112 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
113 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 112 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
114 1, 1, 1, 4, 1, 1, 1, 1, 1 113 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
114 1, 1, 1, 4, 1, 1, 1, 1, 1
115} }; 115} };
116 116
117 117
118__attribute__ ((weak)) 118__attribute__ ((weak))
119void rgb_matrix_indicators_user(void) 119void rgb_matrix_indicators_user(void) {
120{ 120 if (host_keyboard_led_state().caps_lock) {
121 if (host_keyboard_led_state().caps_lock)
122 {
123 rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF); 121 rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
124 } 122 }
125} 123}