aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormoyi4681 <moyi4681@users.noreply.github.com>2019-11-15 03:55:46 +0800
committerDrashna Jaelre <drashna@live.com>2019-11-14 11:55:46 -0800
commit426c03eda0deb62d916498fbdd671c7d3532b9e4 (patch)
treea83ddac8182c0e9b3039e5605c56e476358348b7
parent5edd4b99fe4db7371a04fc554bb8f4672ccae707 (diff)
downloadqmk_firmware-426c03eda0deb62d916498fbdd671c7d3532b9e4.tar.gz
qmk_firmware-426c03eda0deb62d916498fbdd671c7d3532b9e4.zip
[Keyboard] add kbdmini; dztech, kbdfans keyboards cleanup (#7223)
* add kbdmini, dztech and kbdfans keyboards small fix * Caps lock indicator moved from keymap * Update dz65rgb.c * fix error * fix matthewrobo keymap error * Update keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/dztech/dz60rgb/dz60rgb.c Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/dztech/dz65rgb/dz65rgb.c Co-Authored-By: fauxpark <fauxpark@gmail.com> * wrap all of the g_led_config stuff and rgb matrix functions in ifdefs wrap all of the g_led_config stuff and rgb matrix functions in ifdefs
Diffstat
-rw-r--r--keyboards/dz60/config.h8
-rw-r--r--keyboards/dztech/dz40rgb/dz40rgb.c203
-rw-r--r--keyboards/dztech/dz40rgb/dz40rgb.h27
-rw-r--r--keyboards/dztech/dz40rgb/keymaps/default/config.h3
-rw-r--r--keyboards/dztech/dz40rgb/keymaps/default/keymap.c71
-rw-r--r--keyboards/dztech/dz40rgb/keymaps/split_space/config.h5
-rw-r--r--keyboards/dztech/dz40rgb/keymaps/split_space/keymap.c96
-rw-r--r--keyboards/dztech/dz60rgb/config.h9
-rw-r--r--keyboards/dztech/dz60rgb/dz60rgb.c354
-rw-r--r--keyboards/dztech/dz60rgb/dz60rgb.h56
-rw-r--r--keyboards/dztech/dz60rgb/info.json4
-rw-r--r--keyboards/dztech/dz60rgb/keymaps/ansi/config.h2
-rw-r--r--keyboards/dztech/dz60rgb/keymaps/ansi/keymap.c78
-rw-r--r--keyboards/dztech/dz60rgb/keymaps/default/keymap.c87
-rw-r--r--keyboards/dztech/dz60rgb/keymaps/hhkb/config.h2
-rw-r--r--keyboards/dztech/dz60rgb/keymaps/hhkb/keymap.c79
-rw-r--r--keyboards/dztech/dz60rgb/keymaps/hhkb_iso/config.h2
-rw-r--r--keyboards/dztech/dz60rgb/keymaps/hhkb_iso/keymap.c79
-rw-r--r--keyboards/dztech/dz60rgb/keymaps/iso/config.h2
-rw-r--r--keyboards/dztech/dz60rgb/keymaps/iso/keymap.c78
-rw-r--r--keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h2
-rw-r--r--keyboards/dztech/dz60rgb/rules.mk4
-rw-r--r--keyboards/dztech/dz60rgb_ansi/config.h (renamed from keyboards/dztech/dz40rgb/config.h)23
-rw-r--r--keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c118
-rw-r--r--keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.h16
-rw-r--r--keyboards/dztech/dz60rgb_ansi/info.json13
-rw-r--r--keyboards/dztech/dz60rgb_ansi/keymaps/default/keymap.c36
-rw-r--r--keyboards/dztech/dz60rgb_ansi/readme.md15
-rw-r--r--keyboards/dztech/dz60rgb_ansi/rules.mk (renamed from keyboards/dztech/dz40rgb/rules.mk)6
-rw-r--r--keyboards/dztech/dz60rgb_wkl/config.h39
-rw-r--r--keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c116
-rw-r--r--keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.h16
-rw-r--r--keyboards/dztech/dz60rgb_wkl/info.json12
-rw-r--r--keyboards/dztech/dz60rgb_wkl/keymaps/default/keymap.c37
-rw-r--r--keyboards/dztech/dz60rgb_wkl/readme.md15
-rw-r--r--keyboards/dztech/dz60rgb_wkl/rules.mk14
-rw-r--r--keyboards/dztech/dz65rgb/config.h23
-rw-r--r--keyboards/dztech/dz65rgb/dz65rgb.c126
-rw-r--r--keyboards/dztech/dz65rgb/keymaps/default/keymap.c2
-rw-r--r--keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h2
-rw-r--r--keyboards/geekboards/tester/config.h3
-rw-r--r--keyboards/kbdfans/kbd19x/config.h6
-rw-r--r--keyboards/kbdfans/kbd4x/config.h5
-rw-r--r--keyboards/kbdfans/kbd66/config.h4
-rw-r--r--keyboards/kbdfans/kbd67/hotswap/config.h4
-rw-r--r--keyboards/kbdfans/kbd67/mkii_soldered/config.h3
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb/config.h22
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c9
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c12
-rw-r--r--keyboards/kbdfans/kbd67/rev1/config.h4
-rw-r--r--keyboards/kbdfans/kbd67/rev2/config.h1
-rw-r--r--keyboards/kbdfans/kbd6x/config.h5
-rw-r--r--keyboards/kbdfans/kbd75/config.h1
-rw-r--r--keyboards/kbdfans/kbd8x/config.h5
-rw-r--r--keyboards/kbdfans/kbd8x_mk2/config.h4
-rw-r--r--keyboards/kbdfans/kbdmini/config.h47
-rw-r--r--keyboards/kbdfans/kbdmini/kbdmini.c96
-rw-r--r--keyboards/kbdfans/kbdmini/kbdmini.h15
-rw-r--r--keyboards/kbdfans/kbdmini/keymaps/default/keymap.c9
-rw-r--r--keyboards/kbdfans/kbdmini/readme.md13
-rw-r--r--keyboards/kbdfans/kbdmini/rules.mk33
-rw-r--r--keyboards/kbdfans/kbdpad_mk2/config.h3
-rw-r--r--keyboards/xbows/knight/config.h2
-rw-r--r--keyboards/xbows/woody/config.h3
64 files changed, 852 insertions, 1337 deletions
diff --git a/keyboards/dz60/config.h b/keyboards/dz60/config.h
index d121d997b..63794d027 100644
--- a/keyboards/dz60/config.h
+++ b/keyboards/dz60/config.h
@@ -25,8 +25,9 @@
25 25
26/* number of backlight levels */ 26/* number of backlight levels */
27#define BACKLIGHT_PIN B6 27#define BACKLIGHT_PIN B6
28#ifdef BACKLIGHT_PIN
28#define BACKLIGHT_LEVELS 5 29#define BACKLIGHT_LEVELS 5
29 30#endif
30/* Set 0 if debouncing isn't needed */ 31/* Set 0 if debouncing isn't needed */
31#define DEBOUNCE 5 32#define DEBOUNCE 5
32 33
@@ -35,12 +36,13 @@
35 36
36/* Locking resynchronize hack */ 37/* Locking resynchronize hack */
37#define LOCKING_RESYNC_ENABLE 38#define LOCKING_RESYNC_ENABLE
38
39#define RGB_DI_PIN E2 39#define RGB_DI_PIN E2
40#ifdef RGB_DI_PIN
40#define RGBLIGHT_ANIMATIONS 41#define RGBLIGHT_ANIMATIONS
41#define RGBLED_NUM 16 42#define RGBLED_NUM 16
42#define RGBLIGHT_HUE_STEP 8 43#define RGBLIGHT_HUE_STEP 8
43#define RGBLIGHT_SAT_STEP 8 44#define RGBLIGHT_SAT_STEP 8
44#define RGBLIGHT_VAL_STEP 8 45#define RGBLIGHT_VAL_STEP 8
45 46#define RGBLIGHT_SLEEP
47#endif
46#endif \ No newline at end of file 48#endif \ No newline at end of file
diff --git a/keyboards/dztech/dz40rgb/dz40rgb.c b/keyboards/dztech/dz40rgb/dz40rgb.c
deleted file mode 100644
index 92e4a7cad..000000000
--- a/keyboards/dztech/dz40rgb/dz40rgb.c
+++ /dev/null
@@ -1,203 +0,0 @@
1#include "dz40rgb.h"
2#include "config.h"
3#if defined (split_space)
4const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
5/* Refer to IS31 manual for these locations
6 * driver
7 * | R location
8 * | | G location
9 * | | | B location
10 * | | | | */
11 {0, K_12, J_12, L_12},
12 {0, K_11, J_11, L_11},
13 {0, K_10, J_10, L_10},
14 {0, K_9, J_9, L_9},
15 {0, K_8, J_8, L_8},
16 {0, K_7, J_7, L_7},
17 {0, K_6, J_6, L_6},
18 {0, K_5, J_5, L_5},
19 {0, K_4, J_4, L_4},
20 {0, K_3, J_3, L_3},
21 {0, K_2, J_2, L_2},
22 {0, K_1, J_1, L_1},
23
24 {0, K_13, J_13, L_13},
25 {0, K_14, J_14, L_14},
26
27 {0, H_12, G_12, I_12},
28 {0, H_11, G_11, I_11},
29 {0, H_10, G_10, I_10},
30 {0, H_9, G_9, I_9},
31 {0, H_8, G_8, I_8},
32 {0, H_7, G_7, I_7},
33 {0, H_6, G_6, I_6},
34 {0, H_5, G_5, I_5},
35 {0, H_4, G_4, I_4},
36 {0, H_3, G_3, I_3},
37 {0, H_2, G_2, I_2},
38 {0, H_1, G_1, I_1},
39
40 {0, H_13, G_13, I_13},
41 {0, H_14, G_14, I_14},
42
43 {0, E_12, D_12, F_12},
44 {0, E_11, D_11, F_11},
45 {0, E_10, D_10, F_10},
46 {0, E_9, D_9, F_9},
47 {0, E_8, D_8, F_8},
48 {0, E_7, D_7, F_7},
49 {0, E_6, D_6, F_6},
50 {0, E_5, D_5, F_5},
51 {0, E_4, D_4, F_4},
52 {0, E_3, D_3, F_3},
53 {0, E_2, D_2, F_2},
54 {0, E_1, D_1, F_1},
55
56 {0, E_13, D_13, F_13},
57 {0, E_14, D_14, F_14},
58
59 {0, B_12, A_12, C_12},
60 {0, B_11, A_11, C_11},
61 {0, B_10, A_10, C_10},
62 {0, B_9, A_9, C_9},
63 {0, B_8, A_8, C_8},
64 {0, B_7, A_7, C_7},
65 {0, B_6, A_6, C_6},
66 {0, B_5, A_5, C_5},
67 {0, B_4, A_4, C_4},
68 {0, B_3, A_3, C_3},
69 {0, B_2, A_2, C_2},
70 {0, B_1, A_1, C_1}
71
72};
73
74led_config_t g_led_config = { {
75 { 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 },
76 { 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 },
77 { 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28 },
78 { 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42 }
79}, {
80 { 223, 0 }, { 203, 0 }, { 183, 0 }, { 162, 0 }, { 142, 0 }, { 122, 0 }, { 101, 0 }, { 81, 0 }, { 61, 0 }, { 40, 0 }, { 20, 0 }, { 0, 0 },
81 { 223, 10 }, { 0, 10 }, { 223, 21 }, { 203, 21 }, { 183, 21 }, { 162, 21 }, { 142, 21 }, { 122, 21 }, { 101, 21 }, { 81, 21 }, { 61, 21 }, { 40, 21 },
82 { 20, 21 }, { 0, 21 }, { 223, 31 }, { 0, 31 }, { 223, 42 }, { 203, 42 }, { 183, 42 }, { 162, 42 }, { 142, 42 }, { 122, 42 }, { 101, 42 }, { 81, 42 },
83 { 61, 42 }, { 40, 42 }, { 20, 42 }, { 0, 42 }, { 223, 53 }, { 0, 53 }, { 223, 63 }, { 203, 63 }, { 183, 63 }, { 162, 63 }, { 142, 63 }, { 122, 63 },
84 { 101, 63 }, { 81, 63 }, { 61, 63 }, { 40, 63 }, { 20, 63 }, { 0, 63 }
85}, {
86 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
87 1, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4,
88 4, 1, 1, 1, 1, 4, 4, 4, 4, 4, 4, 4,
89 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1,
90 1, 1, 1, 1, 1, 1
91} };
92
93#else
94const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
95/* Refer to IS31 manual for these locations
96 * driver
97 * | R location
98 * | | G location
99 * | | | B location
100 * | | | | */
101 {0, K_12, J_12, L_12},
102 {0, K_11, J_11, L_11},
103 {0, K_10, J_10, L_10},
104 {0, K_9, J_9, L_9},
105 {0, K_8, J_8, L_8},
106 {0, K_7, J_7, L_7},
107 {0, K_6, J_6, L_6},
108 {0, K_5, J_5, L_5},
109 {0, K_4, J_4, L_4},
110 {0, K_3, J_3, L_3},
111 {0, K_2, J_2, L_2},
112 {0, K_1, J_1, L_1},
113
114 {0, K_13, J_13, L_13},
115 {0, K_14, J_14, L_14},
116
117 {0, H_12, G_12, I_12},
118 {0, H_11, G_11, I_11},
119 {0, H_10, G_10, I_10},
120 {0, H_9, G_9, I_9},
121 {0, H_8, G_8, I_8},
122 {0, H_7, G_7, I_7},
123 {0, H_6, G_6, I_6},
124 {0, H_5, G_5, I_5},
125 {0, H_4, G_4, I_4},
126 {0, H_3, G_3, I_3},
127 {0, H_2, G_2, I_2},
128 {0, H_1, G_1, I_1},
129
130 {0, H_13, G_13, I_13},
131 {0, H_14, G_14, I_14},
132
133 {0, E_12, D_12, F_12},
134 {0, E_11, D_11, F_11},
135 {0, E_10, D_10, F_10},
136 {0, E_9, D_9, F_9},
137 {0, E_8, D_8, F_8},
138 {0, E_7, D_7, F_7},
139 {0, E_6, D_6, F_6},
140 {0, E_5, D_5, F_5},
141 {0, E_4, D_4, F_4},
142 {0, E_3, D_3, F_3},
143 {0, E_2, D_2, F_2},
144 {0, E_1, D_1, F_1},
145
146 {0, E_13, D_13, F_13},
147 {0, E_14, D_14, F_14},
148
149 {0, B_12, A_12, C_12},
150 {0, B_11, A_11, C_11},
151 {0, B_10, A_10, C_10},
152 {0, B_9, A_9, C_9},
153 {0, B_8, A_8, C_8},
154 {0, B_13, A_13, C_13},
155 {0, B_5, A_5, C_5},
156 {0, B_4, A_4, C_4},
157 {0, B_3, A_3, C_3},
158 {0, B_2, A_2, C_2},
159 {0, B_1, A_1, C_1}
160
161};
162
163led_config_t g_led_config = { {
164 { 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 },
165 { 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 },
166 { 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28 },
167 { 52, 51, 50, 49, 48, NO_LED, 47, 46, 45, 44, 43, 42 }
168}, {
169 { 223, 0 }, { 203, 0 }, { 183, 0 }, { 162, 0 }, { 142, 0 }, { 122, 0 }, { 101, 0 }, { 81, 0 }, { 61, 0 }, { 40, 0 }, { 20, 0 }, { 0, 0 },
170 { 223, 10 }, { 0, 10 }, { 223, 21 }, { 203, 21 }, { 183, 21 }, { 162, 21 }, { 142, 21 }, { 122, 21 }, { 101, 21 }, { 81, 21 }, { 61, 21 }, { 40, 21 },
171 { 20, 21 }, { 0, 21 }, { 223, 31 }, { 0, 31 }, { 223, 42 }, { 203, 42 }, { 183, 42 }, { 162, 42 }, { 142, 42 }, { 122, 42 }, { 101, 42 }, { 81, 42 },
172 { 61, 42 }, { 40, 42 }, { 20, 42 }, { 0, 42 }, { 223, 53 }, { 0, 53 }, { 223, 63 }, { 203, 63 }, { 183, 63 }, { 162, 63 }, { 142, 63 }, { 111, 63 },
173 { 81, 63 }, { 61, 63 }, { 40, 63 }, { 20, 63 }, { 0, 63 }
174}, {
175 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
176 1, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4,
177 4, 1, 1, 1, 1, 4, 4, 4, 4, 4, 4, 4,
178 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1,
179 1, 1, 1, 1, 1
180} };
181
182#endif
183
184void matrix_init_kb(void) {
185 matrix_init_user();
186}
187void matrix_scan_kb(void) {
188 matrix_scan_user();
189}
190bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
191 return process_record_user(keycode, record);
192}
193void suspend_power_down_kb(void)
194{
195 rgb_matrix_set_suspend_state(true);
196 suspend_power_down_user();
197}
198
199void suspend_wakeup_init_kb(void)
200{
201 rgb_matrix_set_suspend_state(false);
202 suspend_wakeup_init_user();
203}
diff --git a/keyboards/dztech/dz40rgb/dz40rgb.h b/keyboards/dztech/dz40rgb/dz40rgb.h
deleted file mode 100644
index 5f88a6225..000000000
--- a/keyboards/dztech/dz40rgb/dz40rgb.h
+++ /dev/null
@@ -1,27 +0,0 @@
1#pragma once
2#include "quantum.h"
3#define LAYOUT( \
4 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
5 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
6 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
7 k30, k31, k32, k33, k34, k36, k37, k38, k39, k3a, k3b \
8) \
9{ \
10 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
11 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
12 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
13 { k30, k31, k32, k33, k34, k36, k36, k37, k38, k39, k3a, k3b } \
14}
15
16#define LAYOUT_SPLIT( \
17 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
18 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
19 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
20 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
21) \
22{ \
23 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
24 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
25 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
26 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
27}
diff --git a/keyboards/dztech/dz40rgb/keymaps/default/config.h b/keyboards/dztech/dz40rgb/keymaps/default/config.h
deleted file mode 100644
index 30bf11ed5..000000000
--- a/keyboards/dztech/dz40rgb/keymaps/default/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
1#pragma once
2#define DRIVER_1_LED_TOTAL 53
3#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
diff --git a/keyboards/dztech/dz40rgb/keymaps/default/keymap.c b/keyboards/dztech/dz40rgb/keymaps/default/keymap.c
deleted file mode 100644
index e4f56f5a8..000000000
--- a/keyboards/dztech/dz40rgb/keymaps/default/keymap.c
+++ /dev/null
@@ -1,71 +0,0 @@
1#include QMK_KEYBOARD_H
2#define _LAYER0 0
3#define _LAYER1 1
4#define _LAYER2 2
5#define _LAYER3 3
6const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
7 [_LAYER0] = LAYOUT( /* Base */
8 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
9 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
10 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
11 RGB_MOD, KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
12 ),
13 [_LAYER1] = LAYOUT( /* FN */
14 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
15 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
16 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______,
17 _______, _______, _______, _______, _______, _______, TO(3), KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
18 ),
19 [_LAYER2] = LAYOUT( /* FN2 */
20 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
21 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
22 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
23 RGB_TOG, RGB_MOD, BL_INC, BL_DEC, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
24 ),
25 [_LAYER3] = LAYOUT( /* FN3 */
26 TO(0), RESET, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
27 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
28 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
29 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
30 ),
31
32};
33
34void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool default_layer) {
35 for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
36 if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
37 rgb_matrix_set_color( i, red, green, blue );
38 }
39 }
40}
41
42void rgb_matrix_indicators_user(void) {
43 if (!g_suspend_state) {
44 switch (biton32(layer_state)) {
45 case _LAYER1:
46 rgb_matrix_layer_helper(0xFF, 0x00, 0x00, false); break;
47 case _LAYER2:
48 rgb_matrix_layer_helper(0x00, 0xFF, 0x00, false); break;
49 case _LAYER3:
50 rgb_matrix_layer_helper(0xFF, 0xFF, 0x00, false); break;
51 }
52 }
53
54}
55
56
57
58
59
60void matrix_init_user(void) {
61 //user initialization
62}
63
64void matrix_scan_user(void) {
65 //user matrix
66}
67
68 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
69 return true;
70 }
71
diff --git a/keyboards/dztech/dz40rgb/keymaps/split_space/config.h b/keyboards/dztech/dz40rgb/keymaps/split_space/config.h
deleted file mode 100644
index 4f35bef37..000000000
--- a/keyboards/dztech/dz40rgb/keymaps/split_space/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
1#pragma once
2#include "../../config.h"
3#define split_space
4#define DRIVER_1_LED_TOTAL 54
5#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
diff --git a/keyboards/dztech/dz40rgb/keymaps/split_space/keymap.c b/keyboards/dztech/dz40rgb/keymaps/split_space/keymap.c
deleted file mode 100644
index 04c31bab1..000000000
--- a/keyboards/dztech/dz40rgb/keymaps/split_space/keymap.c
+++ /dev/null
@@ -1,96 +0,0 @@
1#include QMK_KEYBOARD_H
2#define _LAYER0 0
3#define _LAYER1 1
4#define _LAYER2 2
5#define _LAYER3 3
6#define _LAYER4 4
7#define _LAYER5 5
8#define _LAYER6 6
9#define _LAYER7 7
10const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
11 [_LAYER0] = LAYOUT_SPLIT( /* Base */
12 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
13 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
14 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
15 RGB_MOD, KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
16 [_LAYER1] = LAYOUT_SPLIT( /* FN */
17 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
18 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
19 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______,
20 _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY),
21 [_LAYER2] = LAYOUT_SPLIT( /* LIGHT */
22 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
23 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
24 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
25 _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY),
26 [_LAYER3] = LAYOUT_SPLIT( /* NUMPAD */
27 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
28 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
29 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
30 RGB_MOD, KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
31 [_LAYER4] = LAYOUT_SPLIT( /* MAC */
32 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
33 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
34 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
35 RGB_MOD, KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
36 [_LAYER5] = LAYOUT_SPLIT( /* NEED TO DEFINE */
37 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
38 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
39 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
40 RGB_MOD, KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
41 [_LAYER6] = LAYOUT_SPLIT( /* NEED TO DEFINE */
42 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
43 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
44 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
45 RGB_MOD, KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
46 [_LAYER7] = LAYOUT_SPLIT( /* NEED TO DEFINE */
47 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
48 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
49 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
50 RGB_MOD, KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
51 };
52
53
54
55void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool default_layer) {
56 for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
57 if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
58 rgb_matrix_set_color( i, red, green, blue );
59 }
60 }
61}
62
63void rgb_matrix_indicators_user(void) {
64 if (!g_suspend_state) {
65 switch (biton32(layer_state)) {
66 case _LAYER1:
67 rgb_matrix_layer_helper(0xFF, 0x00, 0x00, false); break;
68 case _LAYER2:
69 rgb_matrix_layer_helper(0x00, 0xFF, 0x00, false); break;
70 case _LAYER4:
71 rgb_matrix_layer_helper(0xFF, 0xFF, 0x00, false); break;
72 case _LAYER5:
73 rgb_matrix_layer_helper(0x00, 0xFF, 0xFF, false); break;
74 case _LAYER6:
75 rgb_matrix_layer_helper(0xFF, 0xFF, 0xFF, false); break;
76 }
77 }
78
79}
80
81
82
83
84
85void matrix_init_user(void) {
86 //user initialization
87}
88
89void matrix_scan_user(void) {
90 //user matrix
91}
92
93 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
94 return true;
95 }
96
diff --git a/keyboards/dztech/dz60rgb/config.h b/keyboards/dztech/dz60rgb/config.h
index edf0982ab..c9f6937ee 100644
--- a/keyboards/dztech/dz60rgb/config.h
+++ b/keyboards/dztech/dz60rgb/config.h
@@ -21,6 +21,7 @@
21#define DIODE_DIRECTION COL2ROW 21#define DIODE_DIRECTION COL2ROW
22 22
23#define DEBOUNCE 3 23#define DEBOUNCE 3
24#ifdef RGB_MATRIX_ENABLE
24#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects 25#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
25#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended 26#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
26#define RGB_MATRIX_KEYPRESSES 27#define RGB_MATRIX_KEYPRESSES
@@ -29,14 +30,10 @@
29#define DISABLE_RGB_MATRIX_SPLASH 30#define DISABLE_RGB_MATRIX_SPLASH
30#define DISABLE_RGB_MATRIX_MULTISPLASH 31#define DISABLE_RGB_MATRIX_MULTISPLASH
31#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH 32#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
33#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
32#define DRIVER_ADDR_1 0b1010000 34#define DRIVER_ADDR_1 0b1010000
33#define DRIVER_ADDR_2 0b1010000 // this is here for compliancy reasons. 35#define DRIVER_ADDR_2 0b1010000 // this is here for compliancy reasons.
34#define DRIVER_COUNT 2 36#define DRIVER_COUNT 2
35#if defined (dzrgb60_ansi) || defined (dzrgb60_iso)
36#define DRIVER_1_LED_TOTAL 61
37#elif defined (dzrgb60_hhkb) || defined (dzrgb60_hhkb_iso)
38#define DRIVER_1_LED_TOTAL 62
39#else
40#define DRIVER_1_LED_TOTAL 63 37#define DRIVER_1_LED_TOTAL 63
41#endif
42#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL 38#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
39#endif \ No newline at end of file
diff --git a/keyboards/dztech/dz60rgb/dz60rgb.c b/keyboards/dztech/dz60rgb/dz60rgb.c
index 0909ace23..a8217480d 100644
--- a/keyboards/dztech/dz60rgb/dz60rgb.c
+++ b/keyboards/dztech/dz60rgb/dz60rgb.c
@@ -1,348 +1,5 @@
1#include "dz60rgb.h" 1#include "dz60rgb.h"
2#include "config.h" 2#ifdef RGB_MATRIX_ENABLE
3#if defined (dzrgb60_iso)
4const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
5 {0, K_14, J_14, L_14},
6 {0, K_13, J_13, L_13},
7 {0, K_12, J_12, L_12},
8 {0, K_11, J_11, L_11},
9 {0, K_10, J_10, L_10},
10 {0, K_9, J_9, L_9},
11 {0, K_8, J_8, L_8},
12 {0, K_7, J_7, L_7},
13 {0, K_6, J_6, L_6},
14 {0, K_5, J_5, L_5},
15 {0, K_4, J_4, L_4},
16 {0, K_3, J_3, L_3},
17 {0, K_2, J_2, L_2},
18 {0, K_1, J_1, L_1},
19 {0, H_15, G_15, I_15},
20 {0, H_13, G_13, I_13},
21 {0, H_12, G_12, I_12},
22 {0, H_11, G_11, I_11},
23 {0, H_10, G_10, I_10},
24 {0, H_9, G_9, I_9},
25 {0, H_8, G_8, I_8},
26 {0, H_7, G_7, I_7},
27 {0, H_6, G_6, I_6},
28 {0, H_5, G_5, I_5},
29 {0, H_4, G_4, I_4},
30 {0, H_3, G_3, I_3},
31 {0, H_2, G_2, I_2},
32 {0, H_1, G_1, I_1},
33 {0, B_14, A_14, C_14},
34 {0, E_12, D_12, F_12},
35 {0, E_11, D_11, F_11},
36 {0, E_10, D_10, F_10},
37 {0, E_9, D_9, F_9},
38 {0, E_8, D_8, F_8},
39 {0, E_7, D_7, F_7},
40 {0, E_6, D_6, F_6},
41 {0, E_5, D_5, F_5},
42 {0, E_4, D_4, F_4},
43 {0, E_3, D_3, F_3},
44 {0, E_2, D_2, F_2},
45 {0, E_1, D_1, F_1},
46 {0, B_13, A_13, C_13},
47 {0, B_11, A_11, C_11},
48 {0, B_10, A_10, C_10},
49 {0, B_9, A_9, C_9},
50 {0, B_8, A_8, C_8},
51 {0, B_7, A_7, C_7},
52 {0, B_6, A_6, C_6},
53 {0, B_5, A_5, C_5},
54 {0, B_4, A_4, C_4},
55 {0, B_3, A_3, C_3},
56 {0, B_2, A_2, C_2},
57 {0, B_1, A_1, C_1},
58 {0, B_15, A_15, C_15},
59 {0, E_13, D_13, F_13},
60 {0, B_12, A_12, C_12},
61 {0, E_15, D_15, F_15},
62 {0, B_16, A_16, C_16},
63 {0, E_16, D_16, F_16},
64 {0, H_16, G_16, I_16},
65 {0, K_16, J_16, L_16},
66};
67
68led_config_t g_led_config = { {
69 { 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 },
70 { 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 28 },
71 { 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, NO_LED, 14 },
72 { 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, NO_LED, NO_LED },
73 { 60, 59, 58, NO_LED, NO_LED, 57, NO_LED, NO_LED, NO_LED, 56, 55, 54, NO_LED, 53 }
74}, {
75 { 216, 0 }, { 192, 0 }, { 176, 0 }, { 160, 0 }, { 144, 0 }, { 128, 0 }, { 112, 0 }, { 96, 0 }, { 80, 0 }, { 64, 0 }, { 48, 0 }, { 32, 0 }, { 16, 0 }, { 0, 0 },
76 { 220, 24 }, { 200, 16 }, { 184, 16 }, { 168, 16 }, { 152, 16 }, { 136, 16 }, { 120, 16 }, { 104, 16 }, { 88, 16 }, { 72, 16 }, { 56, 16 }, { 40, 16 }, { 24, 16 }, { 4, 16 },
77 { 204, 32 }, { 188, 32 }, { 172, 32 }, { 156, 32 }, { 140, 32 }, { 124, 32 }, { 108, 32 }, { 92, 32 }, { 76, 32 }, { 60, 32 }, { 44, 32 }, { 28, 32 }, { 6, 32 }, { 210, 48 },
78 { 180, 48 }, { 164, 48 }, { 148, 48 }, { 132, 48 }, { 116, 48 }, { 100, 48 }, { 84, 48 }, { 68, 48 }, { 52, 48 }, { 20, 48 }, { 10, 48 }, { 222, 64 }, { 202, 64 }, { 182, 64 },
79 { 162, 64 }, { 102, 64 }, { 42, 64 }, { 22, 64 }, { 2, 64 }
80}, {
81 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
82 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
83 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
84 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1,
85 1, 4, 1, 1, 1
86} };
87
88#elif defined (dzrgb60_hhkb)
89const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
90 {0, H_15, G_15, I_15},
91 {0, K_14, J_14, L_14},
92 {0, K_13, J_13, L_13},
93 {0, K_12, J_12, L_12},
94 {0, K_11, J_11, L_11},
95 {0, K_10, J_10, L_10},
96 {0, K_9, J_9, L_9},
97 {0, K_8, J_8, L_8},
98 {0, K_7, J_7, L_7},
99 {0, K_6, J_6, L_6},
100 {0, K_5, J_5, L_5},
101 {0, K_4, J_4, L_4},
102 {0, K_3, J_3, L_3},
103 {0, K_2, J_2, L_2},
104 {0, K_1, J_1, L_1},
105 {0, H_14, G_14, I_14},
106 {0, H_13, G_13, I_13},
107 {0, H_12, G_12, I_12},
108 {0, H_11, G_11, I_11},
109 {0, H_10, G_10, I_10},
110 {0, H_9, G_9, I_9},
111 {0, H_8, G_8, I_8},
112 {0, H_7, G_7, I_7},
113 {0, H_6, G_6, I_6},
114 {0, H_5, G_5, I_5},
115 {0, H_4, G_4, I_4},
116 {0, H_3, G_3, I_3},
117 {0, H_2, G_2, I_2},
118 {0, H_1, G_1, I_1},
119 {0, E_14, D_14, F_14},
120 {0, E_12, D_12, F_12},
121 {0, E_11, D_11, F_11},
122 {0, E_10, D_10, F_10},
123 {0, E_9, D_9, F_9},
124 {0, E_8, D_8, F_8},
125 {0, E_7, D_7, F_7},
126 {0, E_6, D_6, F_6},
127 {0, E_5, D_5, F_5},
128 {0, E_4, D_4, F_4},
129 {0, E_3, D_3, F_3},
130 {0, E_2, D_2, F_2},
131 {0, E_1, D_1, F_1},
132 {0, B_14, A_14, C_14},
133 {0, B_13, A_13, C_13},
134 {0, B_11, A_11, C_11},
135 {0, B_10, A_10, C_10},
136 {0, B_9, A_9, C_9},
137 {0, B_8, A_8, C_8},
138 {0, B_7, A_7, C_7},
139 {0, B_6, A_6, C_6},
140 {0, B_5, A_5, C_5},
141 {0, B_4, A_4, C_4},
142 {0, B_3, A_3, C_3},
143 {0, B_2, A_2, C_2},
144 {0, B_1, A_1, C_1},
145 {0, B_15, A_15, C_15},
146 {0, E_13, D_13, F_13},
147 {0, B_12, A_12, C_12},
148 {0, B_16, A_16, C_16},
149 {0, E_16, D_16, F_16},
150 {0, H_16, G_16, I_16},
151 {0, K_16, J_16, L_16},
152};
153
154led_config_t g_led_config = { {
155 { 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1 },
156 { 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15 },
157 { 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 0, 29 },
158 { 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, NO_LED, 42 },
159 { 61, 60, 59, NO_LED, NO_LED, 58, NO_LED, NO_LED, NO_LED, NO_LED, 57, 56, NO_LED, 55 }
160}, {
161 { 224, 0 }, { 208, 0 }, { 192, 0 }, { 176, 0 }, { 160, 0 }, { 144, 0 }, { 128, 0 }, { 112, 0 }, { 96, 0 }, { 80, 0 }, { 64, 0 }, { 48, 0 }, { 32, 0 }, { 16, 0 },
162 { 0, 0 }, { 220, 16 }, { 200, 16 }, { 184, 16 }, { 168, 16 }, { 152, 16 }, { 136, 16 }, { 120, 16 }, { 104, 16 }, { 88, 16 }, { 72, 16 }, { 56, 16 }, { 40, 16 }, { 24, 16 },
163 { 4, 16 }, { 204, 32 }, { 188, 32 }, { 172, 32 }, { 156, 32 }, { 140, 32 }, { 124, 32 }, { 108, 32 }, { 92, 32 }, { 76, 32 }, { 60, 32 }, { 44, 32 }, { 28, 32 }, { 6, 32 },
164 { 224, 48 }, { 202, 48 }, { 180, 48 }, { 164, 48 }, { 148, 48 }, { 132, 48 }, { 116, 48 }, { 100, 48 }, { 84, 48 }, { 68, 48 }, { 52, 48 }, { 20, 48 }, { 10, 48 }, { 218, 64 },
165 { 198, 64 }, { 178, 64 }, { 112, 64 }, { 46, 64 }, { 26, 64 }, { 6, 64 }
166}, {
167 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
168 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
169 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
170 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
171 1, 1, 4, 1, 1, 1
172} };
173
174#elif defined (dzrgb60_hhkb_iso)
175const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
176 {0, H_15, G_15, I_15},
177 {0, K_14, J_14, L_14},
178 {0, K_13, J_13, L_13},
179 {0, K_12, J_12, L_12},
180 {0, K_11, J_11, L_11},
181 {0, K_10, J_10, L_10},
182 {0, K_9, J_9, L_9},
183 {0, K_8, J_8, L_8},
184 {0, K_7, J_7, L_7},
185 {0, K_6, J_6, L_6},
186 {0, K_5, J_5, L_5},
187 {0, K_4, J_4, L_4},
188 {0, K_3, J_3, L_3},
189 {0, K_2, J_2, L_2},
190 {0, K_1, J_1, L_1},
191 {0, K_15, J_15, L_15},
192 {0, H_13, G_13, I_13},
193 {0, H_12, G_12, I_12},
194 {0, H_11, G_11, I_11},
195 {0, H_10, G_10, I_10},
196 {0, H_9, G_9, I_9},
197 {0, H_8, G_8, I_8},
198 {0, H_7, G_7, I_7},
199 {0, H_6, G_6, I_6},
200 {0, H_5, G_5, I_5},
201 {0, H_4, G_4, I_4},
202 {0, H_3, G_3, I_3},
203 {0, H_2, G_2, I_2},
204 {0, H_1, G_1, I_1},
205 {0, E_15, D_15, F_15},
206 {0, E_12, D_12, F_12},
207 {0, E_11, D_11, F_11},
208 {0, E_10, D_10, F_10},
209 {0, E_9, D_9, F_9},
210 {0, E_8, D_8, F_8},
211 {0, E_7, D_7, F_7},
212 {0, E_6, D_6, F_6},
213 {0, E_5, D_5, F_5},
214 {0, E_4, D_4, F_4},
215 {0, E_3, D_3, F_3},
216 {0, E_2, D_2, F_2},
217 {0, E_1, D_1, F_1},
218 {0, B_14, A_14, C_14},
219 {0, B_13, A_13, C_13},
220 {0, B_11, A_11, C_11},
221 {0, B_10, A_10, C_10},
222 {0, B_9, A_9, C_9},
223 {0, B_8, A_8, C_8},
224 {0, B_7, A_7, C_7},
225 {0, B_6, A_6, C_6},
226 {0, B_5, A_5, C_5},
227 {0, B_4, A_4, C_4},
228 {0, B_3, A_3, C_3},
229 {0, B_2, A_2, C_2},
230 {0, B_1, A_1, C_1},
231 {0, B_15, A_15, C_15},
232 {0, E_13, D_13, F_13},
233 {0, B_12, A_12, C_12},
234 {0, B_16, A_16, C_16},
235 {0, E_16, D_16, F_16},
236 {0, H_16, G_16, I_16},
237 {0, K_16, J_16, L_16},
238};
239
240led_config_t g_led_config = { {
241 { 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1 },
242 { 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 29 },
243 { 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 0, 15 },
244 { 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, NO_LED, 42 },
245 { 61, 60, 59, NO_LED, NO_LED, 58, NO_LED, NO_LED, NO_LED, NO_LED, 57, 56, NO_LED, 55 }
246}, {
247 { 224, 0 }, { 208, 0 }, { 192, 0 }, { 176, 0 }, { 160, 0 }, { 144, 0 }, { 128, 0 }, { 112, 0 }, { 96, 0 }, { 80, 0 }, { 64, 0 }, { 48, 0 }, { 32, 0 }, { 16, 0 },
248 { 0, 0 }, { 220, 24 }, { 200, 16 }, { 184, 16 }, { 168, 16 }, { 152, 16 }, { 136, 16 }, { 120, 16 }, { 104, 16 }, { 88, 16 }, { 72, 16 }, { 56, 16 }, { 40, 16 }, { 24, 16 },
249 { 4, 16 }, { 204, 32 }, { 188, 32 }, { 172, 32 }, { 156, 32 }, { 140, 32 }, { 124, 32 }, { 108, 32 }, { 92, 32 }, { 76, 32 }, { 60, 32 }, { 44, 32 }, { 28, 32 }, { 6, 32 },
250 { 224, 48 }, { 202, 48 }, { 180, 48 }, { 164, 48 }, { 148, 48 }, { 132, 48 }, { 116, 48 }, { 100, 48 }, { 84, 48 }, { 68, 48 }, { 52, 48 }, { 20, 48 }, { 10, 48 }, { 218, 64 },
251 { 198, 64 }, { 178, 64 }, { 112, 64 }, { 46, 64 }, { 26, 64 }, { 6, 64 }
252}, {
253 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
254 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
255 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
256 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
257 1, 1, 4, 1, 1, 1
258} };
259
260#elif defined (dzrgb60_ansi)
261const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
262 {0, K_14, J_14, L_14},
263 {0, K_13, J_13, L_13},
264 {0, K_12, J_12, L_12},
265 {0, K_11, J_11, L_11},
266 {0, K_10, J_10, L_10},
267 {0, K_9, J_9, L_9},
268 {0, K_8, J_8, L_8},
269 {0, K_7, J_7, L_7},
270 {0, K_6, J_6, L_6},
271 {0, K_5, J_5, L_5},
272 {0, K_4, J_4, L_4},
273 {0, K_3, J_3, L_3},
274 {0, K_2, J_2, L_2},
275 {0, K_1, J_1, L_1},
276 {0, H_14, G_14, I_14},
277 {0, H_13, G_13, I_13},
278 {0, H_12, G_12, I_12},
279 {0, H_11, G_11, I_11},
280 {0, H_10, G_10, I_10},
281 {0, H_9, G_9, I_9},
282 {0, H_8, G_8, I_8},
283 {0, H_7, G_7, I_7},
284 {0, H_6, G_6, I_6},
285 {0, H_5, G_5, I_5},
286 {0, H_4, G_4, I_4},
287 {0, H_3, G_3, I_3},
288 {0, H_2, G_2, I_2},
289 {0, H_1, G_1, I_1},
290 {0, E_14, D_14, F_14},
291 {0, E_12, D_12, F_12},
292 {0, E_11, D_11, F_11},
293 {0, E_10, D_10, F_10},
294 {0, E_9, D_9, F_9},
295 {0, E_8, D_8, F_8},
296 {0, E_7, D_7, F_7},
297 {0, E_6, D_6, F_6},
298 {0, E_5, D_5, F_5},
299 {0, E_4, D_4, F_4},
300 {0, E_3, D_3, F_3},
301 {0, E_2, D_2, F_2},
302 {0, E_1, D_1, F_1},
303 {0, B_13, A_13, C_13},
304 {0, B_11, A_11, C_11},
305 {0, B_10, A_10, C_10},
306 {0, B_9, A_9, C_9},
307 {0, B_8, A_8, C_8},
308 {0, B_7, A_7, C_7},
309 {0, B_6, A_6, C_6},
310 {0, B_5, A_5, C_5},
311 {0, B_4, A_4, C_4},
312 {0, B_3, A_3, C_3},
313 {0, B_2, A_2, C_2},
314 {0, B_1, A_1, C_1},
315 {0, B_15, A_15, C_15},
316 {0, E_13, D_13, F_13},
317 {0, B_12, A_12, C_12},
318 {0, E_15, D_15, F_15},
319 {0, B_16, A_16, C_16},
320 {0, E_16, D_16, F_16},
321 {0, H_16, G_16, I_16},
322 {0, K_16, J_16, L_16},
323};
324
325led_config_t g_led_config = { {
326 { 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 },
327 { 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 },
328 { 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, NO_LED, 28 },
329 { 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, NO_LED, NO_LED },
330 { 60, 59, 58, NO_LED, NO_LED, 57, NO_LED, NO_LED, NO_LED, 56, 55, 54, NO_LED, 53 }
331}, {
332 { 216, 0 }, { 192, 0 }, { 176, 0 }, { 160, 0 }, { 144, 0 }, { 128, 0 }, { 112, 0 }, { 96, 0 }, { 80, 0 }, { 64, 0 }, { 48, 0 }, { 32, 0 }, { 16, 0 }, { 0, 0 },
333 { 220, 16 }, { 200, 16 }, { 184, 16 }, { 168, 16 }, { 152, 16 }, { 136, 16 }, { 120, 16 }, { 104, 16 }, { 88, 16 }, { 72, 16 }, { 56, 16 }, { 40, 16 }, { 24, 16 }, { 4, 16 },
334 { 214, 24 }, { 188, 32 }, { 172, 32 }, { 156, 32 }, { 140, 32 }, { 124, 32 }, { 108, 32 }, { 92, 32 }, { 76, 32 }, { 60, 32 }, { 44, 32 }, { 28, 32 }, { 6, 32 }, { 210, 48 },
335 { 180, 48 }, { 164, 48 }, { 148, 48 }, { 132, 48 }, { 116, 48 }, { 100, 48 }, { 84, 48 }, { 68, 48 }, { 52, 48 }, { 20, 48 }, { 10, 48 }, { 222, 64 }, { 202, 64 }, { 182, 64 },
336 { 162, 64 }, { 102, 64 }, { 42, 64 }, { 22, 64 }, { 2, 64 }
337}, {
338 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
339 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
340 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
341 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1,
342 1, 4, 1, 1, 1
343} };
344
345#else
346const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { 3const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
347 {0, K_14, J_14, L_14}, 4 {0, K_14, J_14, L_14},
348 {0, K_13, J_13, L_13}, 5 {0, K_13, J_13, L_13},
@@ -452,3 +109,12 @@ void suspend_wakeup_init_kb(void)
452 rgb_matrix_set_suspend_state(false); 109 rgb_matrix_set_suspend_state(false);
453 suspend_wakeup_init_user(); 110 suspend_wakeup_init_user();
454} 111}
112__attribute__ ((weak))
113void rgb_matrix_indicators_user(void)
114{
115 if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK))
116 {
117 rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
118 }
119}
120
diff --git a/keyboards/dztech/dz60rgb/dz60rgb.h b/keyboards/dztech/dz60rgb/dz60rgb.h
index 7cb8a43e4..a029933f1 100644
--- a/keyboards/dztech/dz60rgb/dz60rgb.h
+++ b/keyboards/dztech/dz60rgb/dz60rgb.h
@@ -1,7 +1,6 @@
1#pragma once 1#pragma once
2#define XXX KC_NO 2#define XXX KC_NO
3#include "quantum.h" 3#include "quantum.h"
4
5#define LAYOUT( \ 4#define LAYOUT( \
6 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ 5 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
7 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ 6 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
@@ -15,58 +14,3 @@
15 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D }, \ 14 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D }, \
16 { K40, K41, K42, XXX, XXX, K45, XXX, XXX, K48, K49, K4A, K4B, XXX, K4D } \ 15 { K40, K41, K42, XXX, XXX, K45, XXX, XXX, K48, K49, K4A, K4B, XXX, K4D } \
17} 16}
18#define LAYOUT_ISO( \
19 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
20 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
21 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
22 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \
23 K40, K41, K42, K45, K49, K4A, K4B, K4D \
24) { \
25 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
26 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
27 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \
28 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, XXX }, \
29 { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, XXX, K4D } \
30}
31
32#define LAYOUT_HHKB( \
33 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,\
34 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,\
35 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,\
36 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,\
37 K40, K41, K42, K45, K4A, K4B, K4D \
38) { \
39 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D}, \
40 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
41 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
42 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D }, \
43 { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, XXX, K4A, K4B, XXX, K4D } \
44}
45
46#define LAYOUT_HHKB_ISO( \
47 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
48 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
49 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
50 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
51 K40, K41, K42, K45, K4A, K4B, K4D \
52) { \
53 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,}, \
54 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
55 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
56 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D }, \
57 { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, XXX, K4A, K4B, XXX, K4D } \
58}
59
60#define LAYOUT_60_ansi( \
61 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
62 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
63 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
64 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \
65 K40, K41, K42, K45, K49, K4A, K4B, K4D \
66) { \
67 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
68 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
69 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \
70 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, XXX }, \
71 { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, XXX, K4D } \
72}
diff --git a/keyboards/dztech/dz60rgb/info.json b/keyboards/dztech/dz60rgb/info.json
index 2fbe5a748..e924a0f71 100644
--- a/keyboards/dztech/dz60rgb/info.json
+++ b/keyboards/dztech/dz60rgb/info.json
@@ -9,9 +9,5 @@
9 "key_count": 63, 9 "key_count": 63,
10 "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"Shift", "x":11.25, "y":3, "w":1.75}, {"label":"\u2191", "x":13, "y":3},{"label":"?", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Ctrl", "x":11, "y":4}, {"label":"\u2190", "x":12, "y":4}, {"label":"\u2193", "x":13, "y":4}, {"label":"\u2192", "x":14, "y":4}] 10 "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"Shift", "x":11.25, "y":3, "w":1.75}, {"label":"\u2191", "x":13, "y":3},{"label":"?", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Ctrl", "x":11, "y":4}, {"label":"\u2190", "x":12, "y":4}, {"label":"\u2193", "x":13, "y":4}, {"label":"\u2192", "x":14, "y":4}]
11 }, 11 },
12 "LAYOUT_60_ansi": {
13 "key_count": 61,
14 "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
15 }
16 } 12 }
17} 13}
diff --git a/keyboards/dztech/dz60rgb/keymaps/ansi/config.h b/keyboards/dztech/dz60rgb/keymaps/ansi/config.h
deleted file mode 100644
index 4bfad0df0..000000000
--- a/keyboards/dztech/dz60rgb/keymaps/ansi/config.h
+++ /dev/null
@@ -1,2 +0,0 @@
1#pragma once
2#define dzrgb60_ansi
diff --git a/keyboards/dztech/dz60rgb/keymaps/ansi/keymap.c b/keyboards/dztech/dz60rgb/keymaps/ansi/keymap.c
deleted file mode 100644
index 97133d429..000000000
--- a/keyboards/dztech/dz60rgb/keymaps/ansi/keymap.c
+++ /dev/null
@@ -1,78 +0,0 @@
1#include QMK_KEYBOARD_H
2#define _LAYER0 0
3#define _LAYER1 1
4#define _LAYER2 2
5#define _LAYER3 3
6#define _LAYER4 4
7const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
8 [_LAYER0] = LAYOUT_60_ansi( /* Base */
9 KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,\
10 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH,\
11 CTL_T(KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \
12 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \
13 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), MO(2), KC_RCTL),
14 [_LAYER1] = LAYOUT_60_ansi( /* FN */
15 KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,\
16 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET ,\
17 KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS,\
18 KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDOWN,KC_MNXT, \
19 KC_TRNS, KC_TRNS, KC_TRNS, TO(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
20 [_LAYER2] = LAYOUT_60_ansi( /* FN2 */
21 KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,\
22 KC_TRNS, RGB_TOG, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, RESET ,\
23 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS,\
24 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
25 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
26 [_LAYER3] = LAYOUT_60_ansi( /* FN3 */
27 KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,\
28 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH,\
29 CTL_T(KC_CAPS),KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \
30 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \
31 KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_TRNS,MO(4), KC_RALT, KC_RCTL),
32 [_LAYER4] = LAYOUT_60_ansi( /* FN4 */
33 KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,\
34 KC_TRNS, RGB_TOG, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_PSCR, KC_SLCK, KC_PAUS, RESET ,\
35 KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_SPD, KC_HOME, KC_PGUP, KC_TRNS,\
36 KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDOWN,KC_MNXT, \
37 KC_TRNS, KC_TRNS, KC_TRNS, TO(0), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
38 };
39
40void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool default_layer) {
41 for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
42 if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
43 rgb_matrix_set_color( i, red, green, blue );
44 }
45 }
46}
47
48void rgb_matrix_indicators_user(void) {
49 uint8_t this_led = host_keyboard_leds();
50 if (!g_suspend_state) {
51 switch (biton32(layer_state)) {
52 case _LAYER1:
53 rgb_matrix_layer_helper(0xFF, 0x00, 0x00, false); break;
54 case _LAYER2:
55 rgb_matrix_layer_helper(0x00, 0xFF, 0x00, false); break;
56 case _LAYER3:
57 rgb_matrix_layer_helper(0x00, 0x00, 0xFF, false); break;
58 case _LAYER4:
59 rgb_matrix_layer_helper(0xFF, 0xFF, 0x00, false); break;
60 }
61 }
62 if ( this_led & (1<<USB_LED_CAPS_LOCK)) {
63 rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
64 }
65
66}
67
68void matrix_init_user(void) {
69 //user initialization
70}
71
72void matrix_scan_user(void) {
73 //user matrix
74}
75
76 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
77 return true;
78 }
diff --git a/keyboards/dztech/dz60rgb/keymaps/default/keymap.c b/keyboards/dztech/dz60rgb/keymaps/default/keymap.c
index 464d92e02..b82433bd9 100644
--- a/keyboards/dztech/dz60rgb/keymaps/default/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/default/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
15 TO(3), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,\ 15 TO(3), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,\
16 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET ,\ 16 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET ,\
17 KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, EEP_RST,\ 17 KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, EEP_RST,\
18 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDOWN,KC_VOLU, KC_MUTE,\ 18 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_END, KC_PGDOWN,KC_VOLU, KC_MUTE,\
19 KC_TRNS, KC_TRNS, KC_TRNS, TO(4), KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), 19 KC_TRNS, KC_TRNS, KC_TRNS, TO(4), KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT),
20 [_LAYER2] = LAYOUT( /* LIGHT */ 20 [_LAYER2] = LAYOUT( /* LIGHT */
21 KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,\ 21 KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,\
@@ -36,91 +36,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
36 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, LT(2, KC_DEL),\ 36 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, LT(2, KC_DEL),\
37 KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, TO(0), KC_LEFT, KC_DOWN, KC_RIGHT), 37 KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, TO(0), KC_LEFT, KC_DOWN, KC_RIGHT),
38 }; 38 };
39
40void rgb_matrix_indicators_user(void) {
41 uint8_t this_led = host_keyboard_leds();
42 if (!g_suspend_state) {
43 switch (biton32(layer_state)) {
44 case _LAYER3:
45 if ( this_led & (1<<USB_LED_NUM_LOCK)) {
46 rgb_matrix_set_color(13, 0xFF, 0x00, 0x00);
47 } else {
48 rgb_matrix_set_color(13, 0x00, 0x00, 0x00);
49 }
50 rgb_matrix_set_color(0, 0x00, 0xFF, 0x00);
51 rgb_matrix_set_color(1, 0x00, 0x00, 0x00);
52 rgb_matrix_set_color(1, 0x00, 0xFF, 0x00);
53 rgb_matrix_set_color(2, 0x00, 0xFF, 0x00);
54 rgb_matrix_set_color(3, 0x00, 0xFF, 0x00);
55 rgb_matrix_set_color(4, 0x00, 0xFF, 0x00);
56 rgb_matrix_set_color(5, 0x00, 0x00, 0x00);
57 rgb_matrix_set_color(6, 0x00, 0x00, 0x00);
58 rgb_matrix_set_color(7, 0x00, 0x00, 0x00);
59 rgb_matrix_set_color(8, 0x00, 0x00, 0x00);
60 rgb_matrix_set_color(9, 0xFF, 0xFF, 0x00);
61 rgb_matrix_set_color(10, 0xFF, 0xFF, 0x00);
62 rgb_matrix_set_color(11, 0xFF, 0xFF, 0x00);
63 rgb_matrix_set_color(12, 0xFF, 0xFF, 0x00);
64 rgb_matrix_set_color(14, 0x00, 0x00, 0xFF);
65 rgb_matrix_set_color(15, 0x00, 0x00, 0x00);
66 rgb_matrix_set_color(16, 0x00, 0x00, 0x00);
67 rgb_matrix_set_color(17, 0x00, 0xFF, 0x00);
68 rgb_matrix_set_color(18, 0x00, 0xFF, 0x00);
69 rgb_matrix_set_color(19, 0x00, 0xFF, 0x00);
70 rgb_matrix_set_color(20, 0x00, 0x00, 0x00);
71 rgb_matrix_set_color(21, 0x00, 0x00, 0x00);
72 rgb_matrix_set_color(22, 0x00, 0x00, 0x00);
73 rgb_matrix_set_color(23, 0x00, 0x00, 0x00);
74 rgb_matrix_set_color(24, 0xFF, 0xFF, 0x00);
75 rgb_matrix_set_color(25, 0xFF, 0xFF, 0x00);
76 rgb_matrix_set_color(26, 0xFF, 0xFF, 0x00);
77 rgb_matrix_set_color(27, 0x00, 0x00, 0x00);
78 rgb_matrix_set_color(28, 0x00, 0xFF, 0x00);
79 rgb_matrix_set_color(29, 0x00, 0x00, 0x00);
80 rgb_matrix_set_color(30, 0x00, 0xFF, 0x00);
81 rgb_matrix_set_color(31, 0x00, 0xFF, 0x00);
82 rgb_matrix_set_color(32, 0x00, 0xFF, 0x00);
83 rgb_matrix_set_color(33, 0x00, 0x00, 0x00);
84 rgb_matrix_set_color(34, 0x00, 0x00, 0x00);
85 rgb_matrix_set_color(35, 0x00, 0x00, 0x00);
86 rgb_matrix_set_color(36, 0x00, 0x00, 0x00);
87 rgb_matrix_set_color(37, 0xFF, 0xFF, 0x00);
88 rgb_matrix_set_color(38, 0xFF, 0xFF, 0x00);
89 rgb_matrix_set_color(39, 0xFF, 0xFF, 0x00);
90 rgb_matrix_set_color(40, 0x00, 0x00, 0x00);
91 rgb_matrix_set_color(41, 0x00, 0x00, 0x00);
92 rgb_matrix_set_color(42, 0x00, 0x00, 0x00);
93 rgb_matrix_set_color(43, 0x00, 0xFF, 0x00);
94 rgb_matrix_set_color(44, 0x00, 0xFF, 0x00);
95 rgb_matrix_set_color(45, 0x00, 0xFF, 0x00);
96 rgb_matrix_set_color(46, 0x00, 0x00, 0x00);
97 rgb_matrix_set_color(47, 0x00, 0x00, 0x00);
98 rgb_matrix_set_color(48, 0x00, 0x00, 0x00);
99 rgb_matrix_set_color(49, 0x00, 0x00, 0x00);
100 rgb_matrix_set_color(50, 0xFF, 0xFF, 0x00);
101 rgb_matrix_set_color(51, 0xFF, 0xFF, 0x00);
102 rgb_matrix_set_color(52, 0xFF, 0xFF, 0x00);
103 rgb_matrix_set_color(53, 0x00, 0x00, 0x00);
104 rgb_matrix_set_color(54, 0x00, 0x00, 0x00);
105 rgb_matrix_set_color(55, 0x00, 0x00, 0x00);
106 rgb_matrix_set_color(56, 0x00, 0x00, 0x00);
107 rgb_matrix_set_color(57, 0x00, 0xFF, 0x00);
108 rgb_matrix_set_color(58, 0x00, 0xFF, 0x00);
109 rgb_matrix_set_color(59, 0xFF, 0x00, 0x00);
110 rgb_matrix_set_color(60, 0xFF, 0xFF, 0x00);
111 rgb_matrix_set_color(61, 0xFF, 0xFF, 0x00);
112 rgb_matrix_set_color(62, 0x00, 0x00, 0x00);
113 break;
114 case _LAYER4:
115 rgb_matrix_set_color_all(0xFF, 0xFF, 0x00);
116 break;
117 }
118 }
119 if ( this_led & (1<<USB_LED_CAPS_LOCK)) {
120 rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
121 }
122}
123
124void matrix_init_user(void) { 39void matrix_init_user(void) {
125 //user initialization 40 //user initialization
126} 41}
diff --git a/keyboards/dztech/dz60rgb/keymaps/hhkb/config.h b/keyboards/dztech/dz60rgb/keymaps/hhkb/config.h
deleted file mode 100644
index 2b5e7de6a..000000000
--- a/keyboards/dztech/dz60rgb/keymaps/hhkb/config.h
+++ /dev/null
@@ -1,2 +0,0 @@
1#pragma once
2#define dzrgb60_hhkb
diff --git a/keyboards/dztech/dz60rgb/keymaps/hhkb/keymap.c b/keyboards/dztech/dz60rgb/keymaps/hhkb/keymap.c
deleted file mode 100644
index 091343ac3..000000000
--- a/keyboards/dztech/dz60rgb/keymaps/hhkb/keymap.c
+++ /dev/null
@@ -1,79 +0,0 @@
1#include QMK_KEYBOARD_H
2#define _LAYER0 0
3#define _LAYER1 1
4#define _LAYER2 2
5#define _LAYER3 3
6#define _LAYER4 4
7const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
8 [_LAYER0] = LAYOUT_HHKB( /* Base */
9 KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS,
10 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
11 CTL_T(KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_DEL, KC_ENT,
12 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(2),
13 KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, KC_RALT, MO(1), KC_RCTL),
14 [_LAYER1] = LAYOUT_HHKB( /* FN */
15 KC_GRAVE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS,
16 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET ,\
17 KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS,\
18 KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDOWN,KC_MNXT, KC_TRNS,\
19 KC_TRNS, KC_TRNS, KC_TRNS, TO(3), KC_TRNS, KC_TRNS, KC_TRNS),
20 [_LAYER2] = LAYOUT_HHKB( /* FN2 */
21 KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,\
22 KC_TRNS, RGB_TOG, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, RESET ,\
23 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
24 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
25 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
26 [_LAYER3] = LAYOUT_HHKB( /* FN3 */
27 KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,\
28 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH,\
29 CTL_T(KC_CAPS),KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_DEL, KC_ENT, \
30 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(4),\
31 KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MO(4), KC_RGUI, KC_RCTL),
32 [_LAYER4] = LAYOUT_HHKB( /* FN4 */
33 KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,\
34 KC_TRNS, RGB_TOG, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_PSCR, KC_SLCK, KC_PAUS, RESET ,\
35 KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_SPD, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS,\
36 KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDOWN,KC_MNXT, KC_TRNS,\
37 KC_TRNS, KC_TRNS, KC_TRNS, TO(0), KC_TRNS, KC_TRNS, KC_TRNS),
38 };
39
40
41void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool default_layer) {
42 for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
43 if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
44 rgb_matrix_set_color( i, red, green, blue );
45 }
46 }
47}
48
49void rgb_matrix_indicators_user(void) {
50 uint8_t this_led = host_keyboard_leds();
51 if (!g_suspend_state) {
52 switch (biton32(layer_state)) {
53 case _LAYER1:
54 rgb_matrix_layer_helper(0xFF, 0x00, 0x00, false); break;
55 case _LAYER2:
56 rgb_matrix_layer_helper(0x00, 0xFF, 0x00, false); break;
57 case _LAYER3:
58 rgb_matrix_layer_helper(0x00, 0x00, 0xFF, false); break;
59 case _LAYER4:
60 rgb_matrix_layer_helper(0xFF, 0xFF, 0x00, false); break;
61 }
62 }
63 if ( this_led & (1<<USB_LED_CAPS_LOCK)) {
64 rgb_matrix_set_color(41, 0xFF, 0xFF, 0xFF);
65 }
66
67}
68
69void matrix_init_user(void) {
70 //user initialization
71}
72
73void matrix_scan_user(void) {
74 //user matrix
75}
76
77 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
78 return true;
79 }
diff --git a/keyboards/dztech/dz60rgb/keymaps/hhkb_iso/config.h b/keyboards/dztech/dz60rgb/keymaps/hhkb_iso/config.h
deleted file mode 100644
index 8de5853e1..000000000
--- a/keyboards/dztech/dz60rgb/keymaps/hhkb_iso/config.h
+++ /dev/null
@@ -1,2 +0,0 @@
1#pragma once
2#define dzrgb60_hhkb_iso
diff --git a/keyboards/dztech/dz60rgb/keymaps/hhkb_iso/keymap.c b/keyboards/dztech/dz60rgb/keymaps/hhkb_iso/keymap.c
deleted file mode 100644
index bc8a6fa36..000000000
--- a/keyboards/dztech/dz60rgb/keymaps/hhkb_iso/keymap.c
+++ /dev/null
@@ -1,79 +0,0 @@
1#include QMK_KEYBOARD_H
2#define _LAYER0 0
3#define _LAYER1 1
4#define _LAYER2 2
5#define _LAYER3 3
6#define _LAYER4 4
7#define _LAYER5 5
8const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
9 [_LAYER0] = LAYOUT_HHKB_ISO( /* Base */
10 KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS,
11 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
12 CTL_T(KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_DEL, KC_ENT,
13 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(2),
14 KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, KC_RALT, MO(1), KC_RCTL),
15 [_LAYER1] = LAYOUT_HHKB_ISO( /* FN */
16 KC_GRAVE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS,
17 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET ,\
18 KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS,\
19 KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDOWN,KC_MNXT, KC_TRNS,\
20 KC_TRNS, KC_TRNS, KC_TRNS, TO(3), KC_TRNS, KC_TRNS, KC_TRNS),
21 [_LAYER2] = LAYOUT_HHKB_ISO( /* LIGHT */
22 KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,\
23 KC_TRNS, RGB_TOG, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, RESET ,\
24 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
25 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
26 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
27 [_LAYER3] = LAYOUT_HHKB_ISO( /* NUMPAD */
28 KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,\
29 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH,\
30 CTL_T(KC_CAPS),KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_DEL, KC_ENT, \
31 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(4),\
32 KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MO(4), KC_RGUI, KC_RCTL),
33 [_LAYER4] = LAYOUT_HHKB_ISO( /* MAC */
34 KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,\
35 KC_TRNS, RGB_TOG, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_PSCR, KC_SLCK, KC_PAUS, RESET ,\
36 KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_SPD, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS,\
37 KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDOWN,KC_MNXT, KC_TRNS,\
38 KC_TRNS, KC_TRNS, KC_TRNS, TO(0), KC_TRNS, KC_TRNS, KC_TRNS),
39 };
40
41void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool default_layer) {
42 for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
43 if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
44 rgb_matrix_set_color( i, red, green, blue );
45 }
46 }
47}
48
49void rgb_matrix_indicators_user(void) {
50 uint8_t this_led = host_keyboard_leds();
51 if (!g_suspend_state) {
52 switch (biton32(layer_state)) {
53 case _LAYER1:
54 rgb_matrix_layer_helper(0xFF, 0x00, 0x00, false); break;
55 case _LAYER2:
56 rgb_matrix_layer_helper(0x00, 0xFF, 0x00, false); break;
57 case _LAYER3:
58 rgb_matrix_layer_helper(0x00, 0x00, 0xFF, false); break;
59 case _LAYER4:
60 rgb_matrix_layer_helper(0xFF, 0xFF, 0x00, false); break;
61 }
62 }
63 if ( this_led & (1<<USB_LED_CAPS_LOCK)) {
64 rgb_matrix_set_color(41, 0xFF, 0xFF, 0xFF);
65 }
66
67}
68
69void matrix_init_user(void) {
70 //user initialization
71}
72
73void matrix_scan_user(void) {
74 //user matrix
75}
76
77 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
78 return true;
79 }
diff --git a/keyboards/dztech/dz60rgb/keymaps/iso/config.h b/keyboards/dztech/dz60rgb/keymaps/iso/config.h
deleted file mode 100644
index c765fe0e2..000000000
--- a/keyboards/dztech/dz60rgb/keymaps/iso/config.h
+++ /dev/null
@@ -1,2 +0,0 @@
1#pragma once
2#define dzrgb60_iso
diff --git a/keyboards/dztech/dz60rgb/keymaps/iso/keymap.c b/keyboards/dztech/dz60rgb/keymaps/iso/keymap.c
deleted file mode 100644
index 0b1644506..000000000
--- a/keyboards/dztech/dz60rgb/keymaps/iso/keymap.c
+++ /dev/null
@@ -1,78 +0,0 @@
1#include QMK_KEYBOARD_H
2#define _LAYER0 0
3#define _LAYER1 1
4#define _LAYER2 2
5#define _LAYER3 3
6#define _LAYER4 4
7const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
8 [_LAYER0] = LAYOUT_60_ansi( /* Base */
9 KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,\
10 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH,\
11 CTL_T(KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \
12 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \
13 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), MO(2), KC_RCTL),
14 [_LAYER1] = LAYOUT_60_ansi( /* FN */
15 TO(3), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,\
16 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET,\
17 KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS,\
18 KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDOWN,KC_MNXT, \
19 KC_TRNS, KC_TRNS, KC_TRNS, TO(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
20 [_LAYER2] = LAYOUT_60_ansi( /* FN2 */
21 KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,\
22 KC_TRNS, RGB_TOG, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, RESET,\
23 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS,\
24 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
25 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
26 [_LAYER3] = LAYOUT_60_ansi( /* FN3 */
27 KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,\
28 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH,\
29 CTL_T(KC_CAPS),KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \
30 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \
31 KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_TRNS,MO(4), KC_RALT, KC_RCTL),
32 [_LAYER4] = LAYOUT_60_ansi( /* FN4 */
33 KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,\
34 KC_TRNS, RGB_TOG, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_PSCR, KC_SLCK, KC_PAUS, RESET,\
35 KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_SPD, KC_HOME, KC_PGUP, KC_TRNS,\
36 KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDOWN,KC_MNXT, \
37 KC_TRNS, KC_TRNS, KC_TRNS, TO(0), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
38 };
39
40void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool default_layer) {
41 for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
42 if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
43 rgb_matrix_set_color( i, red, green, blue );
44 }
45 }
46}
47
48void rgb_matrix_indicators_user(void) {
49 uint8_t this_led = host_keyboard_leds();
50 if (!g_suspend_state) {
51 switch (biton32(layer_state)) {
52 case _LAYER1:
53 rgb_matrix_layer_helper(0xFF, 0x00, 0x00, false); break;
54 case _LAYER2:
55 rgb_matrix_layer_helper(0x00, 0xFF, 0x00, false); break;
56 case _LAYER3:
57 rgb_matrix_layer_helper(0x00, 0x00, 0xFF, false); break;
58 case _LAYER4:
59 rgb_matrix_layer_helper(0xFF, 0xFF, 0x00, false); break;
60 }
61 }
62 if ( this_led & (1<<USB_LED_CAPS_LOCK)) {
63 rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
64 }
65
66}
67
68void matrix_init_user(void) {
69 //user initialization
70}
71
72void matrix_scan_user(void) {
73 //user matrix
74}
75
76 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
77 return true;
78 }
diff --git a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h
index a50008beb..1002f010e 100644
--- a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h
+++ b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h
@@ -10,7 +10,7 @@
10#undef DISABLE_RGB_MATRIX_SPLASH 10#undef DISABLE_RGB_MATRIX_SPLASH
11#undef DISABLE_RGB_MATRIX_MULTISPLASH 11#undef DISABLE_RGB_MATRIX_MULTISPLASH
12#undef DISABLE_RGB_MATRIX_SOLID_MULTISPLASH 12#undef DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
13 13#undef RGB_MATRIX_STARTUP_MODE
14#define RGB_MATRIX_FRAMEBUFFER_EFFECTS 14#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
15 15
16// #define DISABLE_RGB_MATRIX_SOLID_COLOR 16// #define DISABLE_RGB_MATRIX_SOLID_COLOR
diff --git a/keyboards/dztech/dz60rgb/rules.mk b/keyboards/dztech/dz60rgb/rules.mk
index 006541504..ed30bec8b 100644
--- a/keyboards/dztech/dz60rgb/rules.mk
+++ b/keyboards/dztech/dz60rgb/rules.mk
@@ -11,6 +11,4 @@ COMMAND_ENABLE = no # Commands for debug and configuration
11NKRO_ENABLE = no # USB Nkey Rollover 11NKRO_ENABLE = no # USB Nkey Rollover
12AUDIO_ENABLE = no 12AUDIO_ENABLE = no
13RGB_MATRIX_ENABLE = IS31FL3733 # Use RGB matrix 13RGB_MATRIX_ENABLE = IS31FL3733 # Use RGB matrix
14NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in 14NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in \ No newline at end of file
15
16LAYOUTS = 60_ansi \ No newline at end of file
diff --git a/keyboards/dztech/dz40rgb/config.h b/keyboards/dztech/dz60rgb_ansi/config.h
index 5f1502f4a..2bd40a44d 100644
--- a/keyboards/dztech/dz40rgb/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/config.h
@@ -4,29 +4,36 @@
4 4
5/* USB Device descriptor parameter */ 5/* USB Device descriptor parameter */
6#define VENDOR_ID 0xFEED 6#define VENDOR_ID 0xFEED
7#define PRODUCT_ID 0x1220 7#define PRODUCT_ID 0x1219
8#define DEVICE_VER 0x0001 8#define DEVICE_VER 0x0001
9#define MANUFACTURER DZTECH 9#define MANUFACTURER DZTECH
10#define PRODUCT DZ40RGB
11#define DESCRIPTION DZ40 ARM RGB keyboard
12#define MATRIX_ROWS 4
13#define MATRIX_COLS 12
14 10
15#define MATRIX_ROW_PINS { B13, B12, A2, A1 } 11#define PRODUCT DZ60RGB
16#define MATRIX_COL_PINS {A6, A7, B0, B1, C15, C14, C13, B9, B8, A8, B14, B15 } 12#define DESCRIPTION DZ60 ARM RGB keyboard
13#define MATRIX_ROWS 5
14#define MATRIX_COLS 14
15
16#define MATRIX_ROW_PINS { B1, B10, B11, B14, B12 }
17#define MATRIX_COL_PINS {A6, A7, B0, B13, B15, A8, A15, B3, B4, B5, B8, B9, C13, C14 }
17 18
18/* #define UNUSED_PINS {A0,A1,A2, A3,A4,A9,A10,C15,A13,A14,B2}*/ 19/* #define UNUSED_PINS {A0,A1,A2, A3,A4,A9,A10,C15,A13,A14,B2}*/
19 20
20#define DIODE_DIRECTION COL2ROW 21#define DIODE_DIRECTION COL2ROW
21 22
22#define DEBOUNCE 3 23#define DEBOUNCE 3
24#ifdef RGB_MATRIX_ENABLE
23#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects 25#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
24#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended 26#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
25#define RGB_MATRIX_KEYPRESSES 27#define RGB_MATRIX_KEYPRESSES
28#define RGB_MATRIX_LED_PROCESS_LIMIT 4
29#define RGB_MATRIX_LED_FLUSH_LIMIT 26
26#define DISABLE_RGB_MATRIX_SPLASH 30#define DISABLE_RGB_MATRIX_SPLASH
27#define DISABLE_RGB_MATRIX_MULTISPLASH 31#define DISABLE_RGB_MATRIX_MULTISPLASH
28#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH 32#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
33#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
29#define DRIVER_ADDR_1 0b1010000 34#define DRIVER_ADDR_1 0b1010000
30#define DRIVER_ADDR_2 0b1010000 // this is here for compliancy reasons. 35#define DRIVER_ADDR_2 0b1010000 // this is here for compliancy reasons.
31
32#define DRIVER_COUNT 2 36#define DRIVER_COUNT 2
37#define DRIVER_1_LED_TOTAL 61
38#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
39#endif \ No newline at end of file
diff --git a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
new file mode 100644
index 000000000..6cb82dd54
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
@@ -0,0 +1,118 @@
1#include "dz60rgb_ansi.h"
2#ifdef RGB_MATRIX_ENABLE
3const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
4 {0, K_14, J_14, L_14},
5 {0, K_13, J_13, L_13},
6 {0, K_12, J_12, L_12},
7 {0, K_11, J_11, L_11},
8 {0, K_10, J_10, L_10},
9 {0, K_9, J_9, L_9},
10 {0, K_8, J_8, L_8},
11 {0, K_7, J_7, L_7},
12 {0, K_6, J_6, L_6},
13 {0, K_5, J_5, L_5},
14 {0, K_4, J_4, L_4},
15 {0, K_3, J_3, L_3},
16 {0, K_2, J_2, L_2},
17 {0, K_1, J_1, L_1},
18 {0, H_14, G_14, I_14},
19 {0, H_13, G_13, I_13},
20 {0, H_12, G_12, I_12},
21 {0, H_11, G_11, I_11},
22 {0, H_10, G_10, I_10},
23 {0, H_9, G_9, I_9},
24 {0, H_8, G_8, I_8},
25 {0, H_7, G_7, I_7},
26 {0, H_6, G_6, I_6},
27 {0, H_5, G_5, I_5},
28 {0, H_4, G_4, I_4},
29 {0, H_3, G_3, I_3},
30 {0, H_2, G_2, I_2},
31 {0, H_1, G_1, I_1},
32 {0, E_14, D_14, F_14},
33 {0, E_12, D_12, F_12},
34 {0, E_11, D_11, F_11},
35 {0, E_10, D_10, F_10},
36 {0, E_9, D_9, F_9},
37 {0, E_8, D_8, F_8},
38 {0, E_7, D_7, F_7},
39 {0, E_6, D_6, F_6},
40 {0, E_5, D_5, F_5},
41 {0, E_4, D_4, F_4},
42 {0, E_3, D_3, F_3},
43 {0, E_2, D_2, F_2},
44 {0, E_1, D_1, F_1},
45 {0, B_13, A_13, C_13},
46 {0, B_11, A_11, C_11},
47 {0, B_10, A_10, C_10},
48 {0, B_9, A_9, C_9},
49 {0, B_8, A_8, C_8},
50 {0, B_7, A_7, C_7},
51 {0, B_6, A_6, C_6},
52 {0, B_5, A_5, C_5},
53 {0, B_4, A_4, C_4},
54 {0, B_3, A_3, C_3},
55 {0, B_2, A_2, C_2},
56 {0, B_1, A_1, C_1},
57 {0, B_15, A_15, C_15},
58 {0, E_13, D_13, F_13},
59 {0, B_12, A_12, C_12},
60 {0, E_15, D_15, F_15},
61 {0, B_16, A_16, C_16},
62 {0, E_16, D_16, F_16},
63 {0, H_16, G_16, I_16},
64 {0, K_16, J_16, L_16},
65};
66
67led_config_t g_led_config = { {
68 { 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 },
69 { 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 },
70 { 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, NO_LED, 28 },
71 { 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, NO_LED, NO_LED },
72 { 60, 59, 58, NO_LED, NO_LED, 57, NO_LED, NO_LED, NO_LED, 56, 55, 54, NO_LED, 53 }
73}, {
74 { 216, 0 }, { 192, 0 }, { 176, 0 }, { 160, 0 }, { 144, 0 }, { 128, 0 }, { 112, 0 }, { 96, 0 }, { 80, 0 }, { 64, 0 }, { 48, 0 }, { 32, 0 }, { 16, 0 }, { 0, 0 },
75 { 220, 16 }, { 200, 16 }, { 184, 16 }, { 168, 16 }, { 152, 16 }, { 136, 16 }, { 120, 16 }, { 104, 16 }, { 88, 16 }, { 72, 16 }, { 56, 16 }, { 40, 16 }, { 24, 16 }, { 4, 16 },
76 { 214, 24 }, { 188, 32 }, { 172, 32 }, { 156, 32 }, { 140, 32 }, { 124, 32 }, { 108, 32 }, { 92, 32 }, { 76, 32 }, { 60, 32 }, { 44, 32 }, { 28, 32 }, { 6, 32 }, { 210, 48 },
77 { 180, 48 }, { 164, 48 }, { 148, 48 }, { 132, 48 }, { 116, 48 }, { 100, 48 }, { 84, 48 }, { 68, 48 }, { 52, 48 }, { 20, 48 }, { 10, 48 }, { 222, 64 }, { 202, 64 }, { 182, 64 },
78 { 162, 64 }, { 102, 64 }, { 42, 64 }, { 22, 64 }, { 2, 64 }
79}, {
80 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
81 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
82 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
83 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1,
84 1, 4, 1, 1, 1
85} };
86#endif
87
88void matrix_init_kb(void) {
89 matrix_init_user();
90}
91void matrix_scan_kb(void) {
92 matrix_scan_user();
93}
94bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
95 return process_record_user(keycode, record);
96}
97void suspend_power_down_kb(void)
98{
99 rgb_matrix_set_suspend_state(true);
100 suspend_power_down_user();
101}
102
103void suspend_wakeup_init_kb(void)
104{
105 rgb_matrix_set_suspend_state(false);
106 suspend_wakeup_init_user();
107}
108
109
110__attribute__ ((weak))
111void rgb_matrix_indicators_user(void)
112{
113 if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK))
114 {
115 rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
116 }
117}
118
diff --git a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.h b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.h
new file mode 100644
index 000000000..de30c58a7
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.h
@@ -0,0 +1,16 @@
1#pragma once
2#define XXX KC_NO
3#include "quantum.h"
4#define LAYOUT_60_ansi( \
5 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
6 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
7 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
8 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \
9 K40, K41, K42, K45, K49, K4A, K4B, K4D \
10) { \
11 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
12 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
13 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \
14 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, XXX }, \
15 { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, XXX, K4D } \
16}
diff --git a/keyboards/dztech/dz60rgb_ansi/info.json b/keyboards/dztech/dz60rgb_ansi/info.json
new file mode 100644
index 000000000..8e449be1d
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_ansi/info.json
@@ -0,0 +1,13 @@
1{
2 "keyboard_name": "dz60rgb_ansi",
3 "url": "",
4 "maintainer": "dztch",
5 "width": 14,
6 "height": 5,
7 "layouts": {
8 "LAYOUT_60_ansi": {
9 "key_count": 61,
10 "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
11 }
12 }
13}
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/default/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/default/keymap.c
new file mode 100644
index 000000000..ac033f308
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
1#include QMK_KEYBOARD_H
2#define _LAYER0 0
3#define _LAYER1 1
4#define _LAYER2 2
5const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
6 [_LAYER0] = LAYOUT_60_ansi( /* Base */
7 KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,\
8 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH,\
9 CTL_T(KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \
10 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \
11 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), MO(2), KC_RCTL),
12 [_LAYER1] = LAYOUT_60_ansi( /* FN */
13 KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,\
14 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET ,\
15 KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS,\
16 KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_END, KC_PGDOWN,KC_MNXT, \
17 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
18 [_LAYER2] = LAYOUT_60_ansi( /* FN2 */
19 KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,\
20 KC_TRNS, RGB_TOG, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, RESET ,\
21 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS,\
22 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
23 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
24 };
25
26void matrix_init_user(void) {
27 //user initialization
28}
29
30void matrix_scan_user(void) {
31 //user matrix
32}
33
34 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
35 return true;
36 }
diff --git a/keyboards/dztech/dz60rgb_ansi/readme.md b/keyboards/dztech/dz60rgb_ansi/readme.md
new file mode 100644
index 000000000..2fffa413b
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_ansi/readme.md
@@ -0,0 +1,15 @@
1# DZ60RGB
2
3![dz60rgb](https://cdn.shopify.com/s/files/1/0043/9140/3591/products/TIM_20190130170231_grande.jpg?v=1548839053)
4
5A hotswap 60% RGB keyboard.
6
7Keyboard Maintainer: DZtech
8Hardware Supported: DZtech dz60rgb, dz60rgb-ansi
9Hardware Availability: [kbdfans](https://kbdfans.myshopify.com/)
10
11Make example for this keyboard (after setting up your build environment):
12
13 make dztech/dz60rgb:default
14
15See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/dztech/dz40rgb/rules.mk b/keyboards/dztech/dz60rgb_ansi/rules.mk
index fc4b028d5..006541504 100644
--- a/keyboards/dztech/dz40rgb/rules.mk
+++ b/keyboards/dztech/dz60rgb_ansi/rules.mk
@@ -2,7 +2,7 @@ MCU = STM32F303
2DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave 2DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
3DFU_SUFFIX_ARGS = -p DF11 -v 0483 3DFU_SUFFIX_ARGS = -p DF11 -v 0483
4BACKLIGHT_ENABLE = no 4BACKLIGHT_ENABLE = no
5BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration 5BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
6MOUSEKEY_ENABLE = yes # Mouse keys 6MOUSEKEY_ENABLE = yes # Mouse keys
7EXTRAKEY_ENABLE = yes # Audio control and System control 7EXTRAKEY_ENABLE = yes # Audio control and System control
8CONSOLE_ENABLE = no # Console for debug 8CONSOLE_ENABLE = no # Console for debug
@@ -11,4 +11,6 @@ COMMAND_ENABLE = no # Commands for debug and configuration
11NKRO_ENABLE = no # USB Nkey Rollover 11NKRO_ENABLE = no # USB Nkey Rollover
12AUDIO_ENABLE = no 12AUDIO_ENABLE = no
13RGB_MATRIX_ENABLE = IS31FL3733 # Use RGB matrix 13RGB_MATRIX_ENABLE = IS31FL3733 # Use RGB matrix
14NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in66666666666666666666666666 14NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in
15
16LAYOUTS = 60_ansi \ No newline at end of file
diff --git a/keyboards/dztech/dz60rgb_wkl/config.h b/keyboards/dztech/dz60rgb_wkl/config.h
new file mode 100644
index 000000000..44ff5f157
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_wkl/config.h
@@ -0,0 +1,39 @@
1#pragma once
2
3#include "config_common.h"
4
5/* USB Device descriptor parameter */
6#define VENDOR_ID 0xFEED
7#define PRODUCT_ID 0x1219
8#define DEVICE_VER 0x0001
9#define MANUFACTURER DZTECH
10
11#define PRODUCT DZ60RGB
12#define DESCRIPTION DZ60 ARM RGB keyboard
13#define MATRIX_ROWS 5
14#define MATRIX_COLS 14
15
16#define MATRIX_ROW_PINS { B1, B10, B11, B14, B12 }
17#define MATRIX_COL_PINS {A6, A7, B0, B13, B15, A8, A15, B3, B4, B5, B8, B9, C13, C14 }
18
19/* #define UNUSED_PINS {A0,A1,A2, A3,A4,A9,A10,C15,A13,A14,B2}*/
20
21#define DIODE_DIRECTION COL2ROW
22
23#define DEBOUNCE 3
24#ifdef RGB_MATRIX_ENABLE
25#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
26#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
27#define RGB_MATRIX_KEYPRESSES
28#define RGB_MATRIX_LED_PROCESS_LIMIT 4
29#define RGB_MATRIX_LED_FLUSH_LIMIT 26
30#define DISABLE_RGB_MATRIX_SPLASH
31#define DISABLE_RGB_MATRIX_MULTISPLASH
32#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
33#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
34#define DRIVER_ADDR_1 0b1010000
35#define DRIVER_ADDR_2 0b1010000 // this is here for compliancy reasons.
36#define DRIVER_COUNT 2
37#define DRIVER_1_LED_TOTAL 62
38#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
39#endif \ No newline at end of file
diff --git a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
new file mode 100644
index 000000000..1c0edb722
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
@@ -0,0 +1,116 @@
1#include "dz60rgb_wkl.h"
2#ifdef RGB_MATRIX_ENABLE
3const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
4 {0, H_15, G_15, I_15},
5 {0, K_14, J_14, L_14},
6 {0, K_13, J_13, L_13},
7 {0, K_12, J_12, L_12},
8 {0, K_11, J_11, L_11},
9 {0, K_10, J_10, L_10},
10 {0, K_9, J_9, L_9},
11 {0, K_8, J_8, L_8},
12 {0, K_7, J_7, L_7},
13 {0, K_6, J_6, L_6},
14 {0, K_5, J_5, L_5},
15 {0, K_4, J_4, L_4},
16 {0, K_3, J_3, L_3},
17 {0, K_2, J_2, L_2},
18 {0, K_1, J_1, L_1},
19 {0, H_14, G_14, I_14},
20 {0, H_13, G_13, I_13},
21 {0, H_12, G_12, I_12},
22 {0, H_11, G_11, I_11},
23 {0, H_10, G_10, I_10},
24 {0, H_9, G_9, I_9},
25 {0, H_8, G_8, I_8},
26 {0, H_7, G_7, I_7},
27 {0, H_6, G_6, I_6},
28 {0, H_5, G_5, I_5},
29 {0, H_4, G_4, I_4},
30 {0, H_3, G_3, I_3},
31 {0, H_2, G_2, I_2},
32 {0, H_1, G_1, I_1},
33 {0, E_14, D_14, F_14},
34 {0, E_12, D_12, F_12},
35 {0, E_11, D_11, F_11},
36 {0, E_10, D_10, F_10},
37 {0, E_9, D_9, F_9},
38 {0, E_8, D_8, F_8},
39 {0, E_7, D_7, F_7},
40 {0, E_6, D_6, F_6},
41 {0, E_5, D_5, F_5},
42 {0, E_4, D_4, F_4},
43 {0, E_3, D_3, F_3},
44 {0, E_2, D_2, F_2},
45 {0, E_1, D_1, F_1},
46 {0, B_14, A_14, C_14},
47 {0, B_13, A_13, C_13},
48 {0, B_11, A_11, C_11},
49 {0, B_10, A_10, C_10},
50 {0, B_9, A_9, C_9},
51 {0, B_8, A_8, C_8},
52 {0, B_7, A_7, C_7},
53 {0, B_6, A_6, C_6},
54 {0, B_5, A_5, C_5},
55 {0, B_4, A_4, C_4},
56 {0, B_3, A_3, C_3},
57 {0, B_2, A_2, C_2},
58 {0, B_1, A_1, C_1},
59 {0, B_15, A_15, C_15},
60 {0, E_13, D_13, F_13},
61 {0, B_12, A_12, C_12},
62 {0, B_16, A_16, C_16},
63 {0, E_16, D_16, F_16},
64 {0, H_16, G_16, I_16},
65 {0, K_16, J_16, L_16},
66};
67
68led_config_t g_led_config = { {
69 { 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1 },
70 { 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15 },
71 { 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 0, 29 },
72 { 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, NO_LED, 42 },
73 { 61, 60, 59, NO_LED, NO_LED, 58, NO_LED, NO_LED, NO_LED, NO_LED, 57, 56, NO_LED, 55 }
74}, {
75 { 224, 0 }, { 208, 0 }, { 192, 0 }, { 176, 0 }, { 160, 0 }, { 144, 0 }, { 128, 0 }, { 112, 0 }, { 96, 0 }, { 80, 0 }, { 64, 0 }, { 48, 0 }, { 32, 0 }, { 16, 0 },
76 { 0, 0 }, { 220, 16 }, { 200, 16 }, { 184, 16 }, { 168, 16 }, { 152, 16 }, { 136, 16 }, { 120, 16 }, { 104, 16 }, { 88, 16 }, { 72, 16 }, { 56, 16 }, { 40, 16 }, { 24, 16 },
77 { 4, 16 }, { 204, 32 }, { 188, 32 }, { 172, 32 }, { 156, 32 }, { 140, 32 }, { 124, 32 }, { 108, 32 }, { 92, 32 }, { 76, 32 }, { 60, 32 }, { 44, 32 }, { 28, 32 }, { 6, 32 },
78 { 224, 48 }, { 202, 48 }, { 180, 48 }, { 164, 48 }, { 148, 48 }, { 132, 48 }, { 116, 48 }, { 100, 48 }, { 84, 48 }, { 68, 48 }, { 52, 48 }, { 20, 48 }, { 10, 48 }, { 218, 64 },
79 { 198, 64 }, { 178, 64 }, { 112, 64 }, { 46, 64 }, { 26, 64 }, { 6, 64 }
80}, {
81 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
82 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
83 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
84 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
85 1, 1, 4, 1, 1, 1
86} };
87#endif
88void matrix_init_kb(void) {
89 matrix_init_user();
90}
91void matrix_scan_kb(void) {
92 matrix_scan_user();
93}
94bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
95 return process_record_user(keycode, record);
96}
97void suspend_power_down_kb(void)
98{
99 rgb_matrix_set_suspend_state(true);
100 suspend_power_down_user();
101}
102
103void suspend_wakeup_init_kb(void)
104{
105 rgb_matrix_set_suspend_state(false);
106 suspend_wakeup_init_user();
107}
108
109__attribute__ ((weak))
110void rgb_matrix_indicators_user(void)
111{
112 if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK))
113 {
114 rgb_matrix_set_color(41, 0xFF, 0xFF, 0xFF);
115 }
116}
diff --git a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.h b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.h
new file mode 100644
index 000000000..f017b94cb
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.h
@@ -0,0 +1,16 @@
1#pragma once
2#define XXX KC_NO
3#include "quantum.h"
4#define LAYOUT_HHKB( \
5 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,\
6 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,\
7 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,\
8 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,\
9 K40, K41, K42, K45, K4A, K4B, K4D \
10) { \
11 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D}, \
12 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
13 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
14 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D }, \
15 { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, XXX, K4A, K4B, XXX, K4D } \
16}
diff --git a/keyboards/dztech/dz60rgb_wkl/info.json b/keyboards/dztech/dz60rgb_wkl/info.json
new file mode 100644
index 000000000..4c3c3681b
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_wkl/info.json
@@ -0,0 +1,12 @@
1{
2 "keyboard_name": "dz60rgb_wkl",
3 "url": "",
4 "maintainer": "dztech",
5 "width": 15,
6 "height": 5,
7 "layouts": {
8 "LAYOUT_HHKB": {
9 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}, {"x":13.5, "y":4, "w":1.5}]
10 }
11 }
12} \ No newline at end of file
diff --git a/keyboards/dztech/dz60rgb_wkl/keymaps/default/keymap.c b/keyboards/dztech/dz60rgb_wkl/keymaps/default/keymap.c
new file mode 100644
index 000000000..f2de98df0
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_wkl/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
1#include QMK_KEYBOARD_H
2#define _LAYER0 0
3#define _LAYER1 1
4#define _LAYER2 2
5#define _LAYER3 3
6#define _LAYER4 4
7const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
8 [_LAYER0] = LAYOUT_HHKB( /* Base */
9 KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS,
10 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
11 CTL_T(KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_DEL, KC_ENT,
12 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(2),
13 KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, KC_RALT, MO(1), KC_RCTL),
14 [_LAYER1] = LAYOUT_HHKB( /* FN */
15 KC_GRAVE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS,
16 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET ,\
17 KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS,\
18 KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_END, KC_PGDOWN,KC_MNXT, KC_TRNS,\
19 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
20 [_LAYER2] = LAYOUT_HHKB( /* FN2 */
21 KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,\
22 KC_TRNS, RGB_TOG, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, RESET ,\
23 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
24 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
25 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
26 };
27void matrix_init_user(void) {
28 //user initialization
29}
30
31void matrix_scan_user(void) {
32 //user matrix
33}
34
35 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
36 return true;
37 }
diff --git a/keyboards/dztech/dz60rgb_wkl/readme.md b/keyboards/dztech/dz60rgb_wkl/readme.md
new file mode 100644
index 000000000..2fffa413b
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_wkl/readme.md
@@ -0,0 +1,15 @@
1# DZ60RGB
2
3![dz60rgb](https://cdn.shopify.com/s/files/1/0043/9140/3591/products/TIM_20190130170231_grande.jpg?v=1548839053)
4
5A hotswap 60% RGB keyboard.
6
7Keyboard Maintainer: DZtech
8Hardware Supported: DZtech dz60rgb, dz60rgb-ansi
9Hardware Availability: [kbdfans](https://kbdfans.myshopify.com/)
10
11Make example for this keyboard (after setting up your build environment):
12
13 make dztech/dz60rgb:default
14
15See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/dztech/dz60rgb_wkl/rules.mk b/keyboards/dztech/dz60rgb_wkl/rules.mk
new file mode 100644
index 000000000..ed30bec8b
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_wkl/rules.mk
@@ -0,0 +1,14 @@
1MCU = STM32F303
2DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
3DFU_SUFFIX_ARGS = -p DF11 -v 0483
4BACKLIGHT_ENABLE = no
5BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
6MOUSEKEY_ENABLE = yes # Mouse keys
7EXTRAKEY_ENABLE = yes # Audio control and System control
8CONSOLE_ENABLE = no # Console for debug
9COMMAND_ENABLE = no # Commands for debug and configuration
10#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
11NKRO_ENABLE = no # USB Nkey Rollover
12AUDIO_ENABLE = no
13RGB_MATRIX_ENABLE = IS31FL3733 # Use RGB matrix
14NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in \ No newline at end of file
diff --git a/keyboards/dztech/dz65rgb/config.h b/keyboards/dztech/dz65rgb/config.h
index f4c1f1114..611e57d58 100644
--- a/keyboards/dztech/dz65rgb/config.h
+++ b/keyboards/dztech/dz65rgb/config.h
@@ -12,18 +12,35 @@
12#define MATRIX_ROW_PINS { B1, B10, B11, B14, B12 } 12#define MATRIX_ROW_PINS { B1, B10, B11, B14, B12 }
13#define MATRIX_COL_PINS {A6, A7, B0, B13, B15, A8, A15, B3, B4, B5, B8, B9, C13, C14, C15 } 13#define MATRIX_COL_PINS {A6, A7, B0, B13, B15, A8, A15, B3, B4, B5, B8, B9, C13, C14, C15 }
14#define DIODE_DIRECTION COL2ROW 14#define DIODE_DIRECTION COL2ROW
15 15#ifdef RGB_MATRIX_ENABLE
16#define RGB_MATRIX_LED_PROCESS_LIMIT 4 16#define RGB_MATRIX_LED_PROCESS_LIMIT 4
17#define RGB_MATRIX_LED_FLUSH_LIMIT 26 17#define RGB_MATRIX_LED_FLUSH_LIMIT 26
18#define DEBOUNCE 3 18#define DEBOUNCE 3
19#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects 19#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
20#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended 20#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
21#define RGB_MATRIX_KEYPRESSES 21#define RGB_MATRIX_KEYPRESSES
22#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 22#define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
23 23#define DISABLE_RGB_MATRIX_BAND_SAT
24#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
25#define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT
26#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
27#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
28#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
29#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
30#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
31#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
32#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
33#define DISABLE_RGB_MATRIX_SPLASH
34#define DISABLE_RGB_MATRIX_MULTISPLASH
35#define DISABLE_RGB_MATRIX_SOLID_SPLASH
36#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
37#define DISABLE_RGB_MATRIX_DIGITAL_RAIN
38#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
39#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
24#define DRIVER_ADDR_1 0b1110100 40#define DRIVER_ADDR_1 0b1110100
25#define DRIVER_ADDR_2 0b1110111 41#define DRIVER_ADDR_2 0b1110111
26#define DRIVER_COUNT 2 42#define DRIVER_COUNT 2
27#define DRIVER_1_LED_TOTAL 35 43#define DRIVER_1_LED_TOTAL 35
28#define DRIVER_2_LED_TOTAL 33 44#define DRIVER_2_LED_TOTAL 33
29#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 45#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
46#endif \ No newline at end of file
diff --git a/keyboards/dztech/dz65rgb/dz65rgb.c b/keyboards/dztech/dz65rgb/dz65rgb.c
index 766aea26c..8f095960d 100644
--- a/keyboards/dztech/dz65rgb/dz65rgb.c
+++ b/keyboards/dztech/dz65rgb/dz65rgb.c
@@ -1,98 +1,102 @@
1#include "dz65rgb.h" 1#include "dz65rgb.h"
2#ifdef RGB_MATRIX_ENABLE
2const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { 3const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
3 {0, C2_1, C3_1, C4_1}, // LA0 4
4 {0, C1_1, C3_2, C4_2}, // LA1
5 {0, C1_2, C2_2, C4_3}, // LA2
6 {0, C1_3, C2_3, C3_3}, // LA3
7 {0, C1_4, C2_4, C3_4}, // LA4
8 {0, C1_5, C2_5, C3_5}, // LA5
9 {0, C1_6, C2_6, C3_6}, // LA6
10 {0, C1_7, C2_7, C3_7}, // LA7
11 {0, C1_8, C2_8, C3_8}, // LA8
12 {0, C9_1, C8_1, C7_1}, // LA9
13 {0, C9_2, C8_2, C7_2}, // LA10
14 {0, C9_3, C8_3, C7_3}, // LA11
15 {0, C9_4, C8_4, C7_4}, // LA12
16 {0, C9_5, C8_5, C7_5}, // LA13
17 {0, C9_6, C8_6, C7_6}, // LA14
18 {0, C9_7, C8_7, C6_6}, // LA15
19 {0, C9_8, C7_7, C6_7}, // LA16
20 {0, C8_8, C7_8, C6_8}, // LA17 5 {0, C8_8, C7_8, C6_8}, // LA17
6 {0, C9_8, C7_7, C6_7}, // LA16
7 {0, C9_7, C8_7, C6_6}, // LA15
8 {0, C9_6, C8_6, C7_6}, // LA14
9 {0, C9_5, C8_5, C7_5}, // LA13
10 {0, C9_4, C8_4, C7_4}, // LA12
11 {0, C9_3, C8_3, C7_3}, // LA11
12 {0, C9_2, C8_2, C7_2}, // LA10
13 {0, C9_1, C8_1, C7_1}, // LA9
21 {0, C2_9, C3_9, C4_9}, // LB0 14 {0, C2_9, C3_9, C4_9}, // LB0
22 {0, C1_9, C3_10, C4_10}, // LB1 15 {0, C1_9, C3_10, C4_10}, // LB1
23 {0, C1_10, C2_10, C4_11}, // LB2 16 {0, C1_10, C2_10, C4_11}, // LB2
24 {0, C1_11, C2_11, C3_11}, // LB3 17 {0, C1_11, C2_11, C3_11}, // LB3
25 //{0, C1_12, C2_12, C3_12}, // LB4
26 {0, C1_13, C2_13, C3_13}, // LB5 18 {0, C1_13, C2_13, C3_13}, // LB5
27 {0, C1_14, C2_14, C3_14}, // LB6 19 {0, C1_14, C2_14, C3_14}, // LB6
28 {0, C1_15, C2_15, C3_15}, // LB7 20
29 {0, C1_16, C2_16, C3_16}, // LB8 21 {0, C1_7, C2_7, C3_7}, // LA7
22 {0, C1_6, C2_6, C3_6}, // LA6
23 {0, C1_5, C2_5, C3_5}, // LA5
24 {0, C1_4, C2_4, C3_4}, // LA4
25 {0, C1_3, C2_3, C3_3}, // LA3
26 {0, C1_2, C2_2, C4_3}, // LA2
27 {0, C1_1, C3_2, C4_2}, // LA1
28 {0, C2_1, C3_1, C4_1}, // LA0
30 {0, C9_9, C8_9, C7_9}, // LB9 29 {0, C9_9, C8_9, C7_9}, // LB9
31 {0, C9_10, C8_10, C7_10}, // LB10 30 {0, C9_10, C8_10, C7_10}, // LB10
32 {0, C9_11, C8_11, C7_11}, // LB11 31 {0, C9_11, C8_11, C7_11}, // LB11
33 {0, C9_12, C8_12, C7_12}, // LB12 32 {0, C9_12, C8_12, C7_12}, // LB12
34 {0, C9_13, C8_13, C7_13}, // LB13 33 {0, C9_13, C8_13, C7_13}, // LB13
35 {0, C9_14, C8_14, C7_14}, // LB14 34 {0, C9_14, C8_14, C7_14}, // LB14
36 {0, C9_15, C8_15, C6_14}, // LB15 35 {0, C1_15, C2_15, C3_15}, // LB7
37 {0, C9_16, C7_15, C6_15}, // LB16 36
38 {0, C8_16, C7_16, C6_16}, // LB17 37 {0, C1_8, C2_8, C3_8}, // LA8
39 {1, C2_1, C3_1, C4_1}, // LC0
40 {1, C1_1, C3_2, C4_2}, // LC1
41 {1, C1_2, C2_2, C4_3}, // LC2
42 {1, C1_3, C2_3, C3_3}, // LC3
43 {1, C1_4, C2_4, C3_4}, // LC4
44 {1, C1_5, C2_5, C3_5}, // LC5
45 //{1, C1_6, C2_6, C3_6}, // LC6
46 {1, C1_7, C2_7, C3_7}, // LC7
47 {1, C1_8, C2_8, C3_8}, // LC8
48 {1, C9_1, C8_1, C7_1}, // LC9
49 {1, C9_2, C8_2, C7_2}, // LC10
50 {1, C9_3, C8_3, C7_3}, // LC11
51 {1, C9_4, C8_4, C7_4}, // LC12
52 {1, C9_5, C8_5, C7_5}, // LC13
53 {1, C9_6, C8_6, C7_6}, // LC14 38 {1, C9_6, C8_6, C7_6}, // LC14
54 //{1, C9_7, C8_7, C6_6}, // LC15 39 {1, C9_5, C8_5, C7_5}, // LC13
55 {1, C9_8, C7_7, C6_7}, // LC16 40 {1, C9_4, C8_4, C7_4}, // LC12
56 {1, C8_8, C7_8, C6_8}, // LC17 41 {1, C9_3, C8_3, C7_3}, // LC11
42 {1, C9_2, C8_2, C7_2}, // LC10
43 {1, C9_1, C8_1, C7_1}, // LC9
57 {1, C2_9, C3_9, C4_9}, // LD0 44 {1, C2_9, C3_9, C4_9}, // LD0
58 {1, C1_9, C3_10, C4_10}, // LD1 45 {1, C1_9, C3_10, C4_10}, // LD1
59 {1, C1_10, C2_10, C4_11}, // LD2 46 {1, C1_10, C2_10, C4_11}, // LD2
60 {1, C1_11, C2_11, C3_11}, // LD3 47 {1, C1_11, C2_11, C3_11}, // LD3
61 {1, C1_12, C2_12, C3_12}, // LD4 48 {1, C1_12, C2_12, C3_12}, // LD4
62 {1, C1_13, C2_13, C3_13}, // LD5 49 {1, C1_13, C2_13, C3_13}, // LD5
63 {1, C1_14, C2_14, C3_14}, // LD6 50 {0, C1_16, C2_16, C3_16}, // LB8
64 {1, C1_15, C2_15, C3_15}, // LD7 51
65 {1, C1_16, C2_16, C3_16}, // LD8 52 {1, C9_8, C7_7, C6_7}, // LC16
53 {1, C1_5, C2_5, C3_5}, // LC5
54 {1, C1_4, C2_4, C3_4}, // LC4
55 {1, C1_3, C2_3, C3_3}, // LC3
56 {1, C1_2, C2_2, C4_3}, // LC2
57 {1, C1_1, C3_2, C4_2}, // LC1
66 {1, C9_9, C8_9, C7_9}, // LD9 58 {1, C9_9, C8_9, C7_9}, // LD9
67 {1, C9_10, C8_10, C7_10}, // LD10 59 {1, C9_10, C8_10, C7_10}, // LD10
68 {1, C9_11, C8_11, C7_11}, // LD11 60 {1, C9_11, C8_11, C7_11}, // LD11
69 {1, C9_12, C8_12, C7_12}, // LD12 61 {1, C9_12, C8_12, C7_12}, // LD12
70 //{1, C9_13, C8_13, C7_13}, // LD13 62 {1, C1_14, C2_14, C3_14}, // LD6
63 {1, C1_15, C2_15, C3_15}, // LD7
64 {1, C1_16, C2_16, C3_16}, // LD8
65 {0, C9_15, C8_15, C6_14}, // LB15
66
67 {1, C8_8, C7_8, C6_8}, // LC17
68 {1, C1_8, C2_8, C3_8}, // LC8
69 {1, C1_7, C2_7, C3_7}, // LC7
70 {1, C2_1, C3_1, C4_1}, // LC0
71 {1, C9_14, C8_14, C7_14}, // LD14 71 {1, C9_14, C8_14, C7_14}, // LD14
72 {1, C9_15, C8_15, C6_14}, // LD15 72 {1, C9_15, C8_15, C6_14}, // LD15
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 {0, C8_16, C7_16, C6_16}, // LB17
76 {0, C9_16, C7_15, C6_15}, // LB16
77
75}; 78};
76 79
77led_config_t g_led_config = { { 80led_config_t g_led_config = { {
78 { 17, 16, 15, 14, 13, 12, 11, 10, 9, 18, 19, 20, 21, 22, 23 }, 81 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 },
79 { 7, 6, 5, 4, 3, 2, 1, 0, 26, 27, 28, 29, 30, 31, 24 }, 82 { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 },
80 { 8, 48, 47, 46, 45, 44, 43, 51, 52, 53, 54, 55, NO_LED, 56, 25 }, 83 { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, NO_LED,42, 43 },
81 { 49, 40, 39, 38, 37, 36, 60, 61, 62, 63, 57, 58, NO_LED, 59, 32 }, 84 { 44, 45, 46, 47, 48, 49, 59, 51, 52, 53, 54, 55, NO_LED,56, 57 },
82 { 50, 42, 41, NO_LED, NO_LED, 35, NO_LED, NO_LED, 64, 65, 66, 67, NO_LED, 34, 33 } 85 { 58, 59, 60, NO_LED,NO_LED,61, NO_LED,NO_LED,62, 63, 64, 65, NO_LED,66, 67 }
83}, { 86}, {
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 }, 87 {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},
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 }, 88 {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},
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 }, 89 {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},
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 }, 90 {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},
88 { 96, 48 }, { 112, 48 }, { 128, 48 }, { 144, 48 }, { 128, 64 }, { 144, 64 }, { 160, 64 }, { 176, 64 } 91 {2,64},{21,64},{39,64},{96,64},{150,64},{165,64},{180,64},{195,64},{210,64},{224,64}
89}, { 92}, {
90 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 93 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
91 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 4, 94 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
92 4, 4, 1, 1, 1, 1, 4, 4, 4, 4, 4, 1, 1, 4, 4, 95 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
93 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 96 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
94 4, 4, 4, 4, 1, 1, 1, 1 97 1, 1, 1, 4, 1, 1, 1, 1, 1, 1
95} }; 98} };
99#endif
96 100
97void matrix_init_kb(void) { 101void matrix_init_kb(void) {
98 matrix_init_user(); 102 matrix_init_user();
@@ -118,8 +122,8 @@ void suspend_wakeup_init_kb(void)
118__attribute__ ((weak)) 122__attribute__ ((weak))
119void rgb_matrix_indicators_user(void) 123void rgb_matrix_indicators_user(void)
120{ 124{
121 if (IS_LED_ON(host_keyboard_leds(), USB_LED_CAPS_LOCK)) 125 if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK))
122 { 126 {
123 rgb_matrix_set_color(8, 0xFF, 0xFF, 0xFF); 127 rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
124 } 128 }
125} 129}
diff --git a/keyboards/dztech/dz65rgb/keymaps/default/keymap.c b/keyboards/dztech/dz65rgb/keymaps/default/keymap.c
index 90f25c0e4..7f1416f1e 100644
--- a/keyboards/dztech/dz65rgb/keymaps/default/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
12 KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME,\ 12 KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME,\
13 KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET, KC_PGUP,\ 13 KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET, KC_PGUP,\
14 CTL_T(KC_CAPS),RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST, KC_PGDN,\ 14 CTL_T(KC_CAPS),RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST, KC_PGDN,\
15 KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,\ 15 KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,\
16 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), 16 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT),
17}; 17};
18 18
diff --git a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h
index babc2abcf..a56af0165 100644
--- a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h
+++ b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h
@@ -6,7 +6,7 @@
6#define TAPPING_TERM 150 6#define TAPPING_TERM 150
7 7
8#define TAP_HOLD_CAPS_DELAY 0 8#define TAP_HOLD_CAPS_DELAY 0
9 9#undef RGB_MATRIX_STARTUP_MODE
10#define RGB_MATRIX_FRAMEBUFFER_EFFECTS 10#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
11 11
12// #define DISABLE_RGB_MATRIX_SOLID_COLOR 12// #define DISABLE_RGB_MATRIX_SOLID_COLOR
diff --git a/keyboards/geekboards/tester/config.h b/keyboards/geekboards/tester/config.h
index ac67877ff..8a6cc09a1 100644
--- a/keyboards/geekboards/tester/config.h
+++ b/keyboards/geekboards/tester/config.h
@@ -23,6 +23,7 @@
23#define LOCKING_RESYNC_ENABLE 23#define LOCKING_RESYNC_ENABLE
24 24
25#define DEBOUNCE 3 25#define DEBOUNCE 3
26#ifdef RGB_MATRIX_ENABLE
26#define RGB_DISABLE_AFTER_TIMEOUT 0 27#define RGB_DISABLE_AFTER_TIMEOUT 0
27#define RGB_DISABLE_WHEN_USB_SUSPENDED true 28#define RGB_DISABLE_WHEN_USB_SUSPENDED true
28#define RGB_MATRIX_KEYPRESSES 29#define RGB_MATRIX_KEYPRESSES
@@ -32,8 +33,8 @@
32#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH 33#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
33#define DRIVER_ADDR_1 0b1110100 34#define DRIVER_ADDR_1 0b1110100
34#define DRIVER_ADDR_2 0b1110101 35#define DRIVER_ADDR_2 0b1110101
35
36#define DRIVER_COUNT 2 36#define DRIVER_COUNT 2
37#define DRIVER_1_LED_TOTAL 8 37#define DRIVER_1_LED_TOTAL 8
38#define DRIVER_2_LED_TOTAL 0 38#define DRIVER_2_LED_TOTAL 0
39#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 39#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
40#endif \ No newline at end of file
diff --git a/keyboards/kbdfans/kbd19x/config.h b/keyboards/kbdfans/kbd19x/config.h
index d722dc261..3fcda998c 100644
--- a/keyboards/kbdfans/kbd19x/config.h
+++ b/keyboards/kbdfans/kbd19x/config.h
@@ -47,11 +47,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
47 47
48/* COL2ROW, ROW2COL*/ 48/* COL2ROW, ROW2COL*/
49#define DIODE_DIRECTION COL2ROW 49#define DIODE_DIRECTION COL2ROW
50
51#define BACKLIGHT_PIN B6 50#define BACKLIGHT_PIN B6
52// #define BACKLIGHT_BREATHING 51#ifdef BACKLIGHT_PIN
53#define BACKLIGHT_LEVELS 3 52#define BACKLIGHT_LEVELS 3
54 53#endif
55#define RGB_DI_PIN E2 54#define RGB_DI_PIN E2
56#ifdef RGB_DI_PIN 55#ifdef RGB_DI_PIN
57#define RGBLIGHT_ANIMATIONS 56#define RGBLIGHT_ANIMATIONS
@@ -59,6 +58,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
59#define RGBLIGHT_HUE_STEP 8 58#define RGBLIGHT_HUE_STEP 8
60#define RGBLIGHT_SAT_STEP 8 59#define RGBLIGHT_SAT_STEP 8
61#define RGBLIGHT_VAL_STEP 8 60#define RGBLIGHT_VAL_STEP 8
61#define RGBLIGHT_SLEEP
62#endif 62#endif
63 63
64/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ 64/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/kbdfans/kbd4x/config.h b/keyboards/kbdfans/kbd4x/config.h
index 07bc4b990..6928ea8ff 100644
--- a/keyboards/kbdfans/kbd4x/config.h
+++ b/keyboards/kbdfans/kbd4x/config.h
@@ -47,11 +47,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
47 47
48/* COL2ROW, ROW2COL*/ 48/* COL2ROW, ROW2COL*/
49#define DIODE_DIRECTION COL2ROW 49#define DIODE_DIRECTION COL2ROW
50
51#define BACKLIGHT_PIN B6 50#define BACKLIGHT_PIN B6
51#ifdef BACKLIGHT_PIN
52#define BACKLIGHT_BREATHING 52#define BACKLIGHT_BREATHING
53#define BACKLIGHT_LEVELS 3 53#define BACKLIGHT_LEVELS 3
54 54#endif
55#define RGB_DI_PIN E2 55#define RGB_DI_PIN E2
56#ifdef RGB_DI_PIN 56#ifdef RGB_DI_PIN
57#define RGBLIGHT_ANIMATIONS 57#define RGBLIGHT_ANIMATIONS
@@ -59,6 +59,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
59#define RGBLIGHT_HUE_STEP 8 59#define RGBLIGHT_HUE_STEP 8
60#define RGBLIGHT_SAT_STEP 8 60#define RGBLIGHT_SAT_STEP 8
61#define RGBLIGHT_VAL_STEP 8 61#define RGBLIGHT_VAL_STEP 8
62#define RGBLIGHT_SLEEP
62#endif 63#endif
63 64
64/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ 65/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/kbdfans/kbd66/config.h b/keyboards/kbdfans/kbd66/config.h
index a2666a619..5d6cab458 100644
--- a/keyboards/kbdfans/kbd66/config.h
+++ b/keyboards/kbdfans/kbd66/config.h
@@ -47,12 +47,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
47 47
48/* COL2ROW, ROW2COL*/ 48/* COL2ROW, ROW2COL*/
49#define DIODE_DIRECTION COL2ROW 49#define DIODE_DIRECTION COL2ROW
50
51#define BACKLIGHT_PIN B6 50#define BACKLIGHT_PIN B6
51#ifdef BACKLIGHT_PIN
52#define BACKLIGHT_LEVELS 3 52#define BACKLIGHT_LEVELS 3
53#define BACKLIGHT_BREATHING 53#define BACKLIGHT_BREATHING
54#define BREATHING_PERIOD 6 54#define BREATHING_PERIOD 6
55 55#endif
56/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ 56/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
57#define DEBOUNCE 5 57#define DEBOUNCE 5
58 58
diff --git a/keyboards/kbdfans/kbd67/hotswap/config.h b/keyboards/kbdfans/kbd67/hotswap/config.h
index fca9916ed..589d76da3 100644
--- a/keyboards/kbdfans/kbd67/hotswap/config.h
+++ b/keyboards/kbdfans/kbd67/hotswap/config.h
@@ -54,9 +54,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
54#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 54#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
55 55
56#define BACKLIGHT_PIN B7 56#define BACKLIGHT_PIN B7
57#ifdef BACKLIGHT_PIN
57#define BACKLIGHT_BREATHING 58#define BACKLIGHT_BREATHING
58#define BACKLIGHT_LEVELS 3 59#define BACKLIGHT_LEVELS 3
59 60#endif
60#define RGB_DI_PIN B4 61#define RGB_DI_PIN B4
61#ifdef RGB_DI_PIN 62#ifdef RGB_DI_PIN
62 #define RGBLED_NUM 8 63 #define RGBLED_NUM 8
@@ -67,6 +68,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
67 // #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ 68 // #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
68// /*== all animations enable ==*/ 69// /*== all animations enable ==*/
69 #define RGBLIGHT_ANIMATIONS 70 #define RGBLIGHT_ANIMATIONS
71 #define RGBLIGHT_SLEEP
70// /*== or choose animations ==*/ 72// /*== or choose animations ==*/
71// #define RGBLIGHT_EFFECT_BREATHING 73// #define RGBLIGHT_EFFECT_BREATHING
72// #define RGBLIGHT_EFFECT_RAINBOW_MOOD 74// #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/config.h b/keyboards/kbdfans/kbd67/mkii_soldered/config.h
index 6a726af06..df0607b24 100644
--- a/keyboards/kbdfans/kbd67/mkii_soldered/config.h
+++ b/keyboards/kbdfans/kbd67/mkii_soldered/config.h
@@ -54,9 +54,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
54//#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 54//#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
55 55
56#define BACKLIGHT_PIN B7 56#define BACKLIGHT_PIN B7
57#ifdef BACKLIGHT_PIN
57#define BACKLIGHT_BREATHING 58#define BACKLIGHT_BREATHING
58#define BACKLIGHT_LEVELS 3 59#define BACKLIGHT_LEVELS 3
59 60#endif
60//#define RGB_DI_PIN B3 61//#define RGB_DI_PIN B3
61//#ifdef RGB_DI_PIN 62//#ifdef RGB_DI_PIN
62// #define RGBLED_NUM 20 63// #define RGBLED_NUM 20
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/config.h b/keyboards/kbdfans/kbd67/mkiirgb/config.h
index 5ef18fcc7..b60685e2b 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/config.h
@@ -19,11 +19,27 @@
19#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects 19#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
20#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended 20#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
21#define RGB_MATRIX_KEYPRESSES 21#define RGB_MATRIX_KEYPRESSES
22#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 22#define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
23#define RGB_MATRIX_FRAMEBUFFER_EFFECTS 23#define DISABLE_RGB_MATRIX_BAND_SAT
24#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
25#define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT
26#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
27#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
28#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
29#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
30#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
31#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
32#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
33#define DISABLE_RGB_MATRIX_SPLASH
34#define DISABLE_RGB_MATRIX_MULTISPLASH
35#define DISABLE_RGB_MATRIX_SOLID_SPLASH
36#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
37#define DISABLE_RGB_MATRIX_DIGITAL_RAIN
38#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
39#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
24#define DRIVER_ADDR_1 0b1110100 40#define DRIVER_ADDR_1 0b1110100
25#define DRIVER_ADDR_2 0b1110111 41#define DRIVER_ADDR_2 0b1110111
26#define DRIVER_COUNT 2 42#define DRIVER_COUNT 2
27#define DRIVER_1_LED_TOTAL 35 43#define DRIVER_1_LED_TOTAL 35
28#define DRIVER_2_LED_TOTAL 32 44#define DRIVER_2_LED_TOTAL 32
29#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 45#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) \ No newline at end of file
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c
index 17bf4ec99..99556b7ef 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c
@@ -15,15 +15,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
15 KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,\ 15 KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,\
16 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), 16 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT),
17}; 17};
18
19void rgb_matrix_indicators_user(void)
20{
21 if (IS_LED_ON(host_keyboard_leds(), USB_LED_CAPS_LOCK))
22 {
23 rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
24 }
25}
26
27void matrix_init_user(void) 18void matrix_init_user(void)
28{ 19{
29 //user initialization 20 //user initialization
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c b/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c
index 430dca952..526949e6f 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c
@@ -117,3 +117,15 @@ void suspend_wakeup_init_kb(void)
117 rgb_matrix_set_suspend_state(false); 117 rgb_matrix_set_suspend_state(false);
118 suspend_wakeup_init_user(); 118 suspend_wakeup_init_user();
119} 119}
120
121__attribute__ ((weak))
122void rgb_matrix_indicators_user(void)
123{
124 if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK))
125 {
126 rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
127 }
128}
129
130
131
diff --git a/keyboards/kbdfans/kbd67/rev1/config.h b/keyboards/kbdfans/kbd67/rev1/config.h
index 7a26192f4..d20dcb1c5 100644
--- a/keyboards/kbdfans/kbd67/rev1/config.h
+++ b/keyboards/kbdfans/kbd67/rev1/config.h
@@ -49,9 +49,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
49#define DIODE_DIRECTION COL2ROW 49#define DIODE_DIRECTION COL2ROW
50 50
51#define BACKLIGHT_PIN B6 51#define BACKLIGHT_PIN B6
52#ifdef BACKLIGHT_PIN
52#define BACKLIGHT_BREATHING 53#define BACKLIGHT_BREATHING
53#define BACKLIGHT_LEVELS 3 54#define BACKLIGHT_LEVELS 3
54 55#endif
55#define RGB_DI_PIN E2 56#define RGB_DI_PIN E2
56#ifdef RGB_DI_PIN 57#ifdef RGB_DI_PIN
57 #define RGBLED_NUM 20 58 #define RGBLED_NUM 20
@@ -62,6 +63,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
62 // #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ 63 // #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
63/*== all animations enable ==*/ 64/*== all animations enable ==*/
64 #define RGBLIGHT_ANIMATIONS 65 #define RGBLIGHT_ANIMATIONS
66 #define RGBLIGHT_SLEEP
65/*== or choose animations ==*/ 67/*== or choose animations ==*/
66 // #define RGBLIGHT_EFFECT_BREATHING 68 // #define RGBLIGHT_EFFECT_BREATHING
67 // #define RGBLIGHT_EFFECT_RAINBOW_MOOD 69 // #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/kbdfans/kbd67/rev2/config.h b/keyboards/kbdfans/kbd67/rev2/config.h
index d4e200fa8..931f5714b 100644
--- a/keyboards/kbdfans/kbd67/rev2/config.h
+++ b/keyboards/kbdfans/kbd67/rev2/config.h
@@ -61,4 +61,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
61#define RGBLIGHT_SAT_STEP 8 61#define RGBLIGHT_SAT_STEP 8
62#define RGBLIGHT_VAL_STEP 8 62#define RGBLIGHT_VAL_STEP 8
63#define RGBLIGHT_LIMIT_VAL 240 63#define RGBLIGHT_LIMIT_VAL 240
64#define RGBLIGHT_SLEEP
64#endif 65#endif
diff --git a/keyboards/kbdfans/kbd6x/config.h b/keyboards/kbdfans/kbd6x/config.h
index 1ee31e569..61d086fbd 100644
--- a/keyboards/kbdfans/kbd6x/config.h
+++ b/keyboards/kbdfans/kbd6x/config.h
@@ -47,11 +47,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
47 47
48/* COL2ROW, ROW2COL*/ 48/* COL2ROW, ROW2COL*/
49#define DIODE_DIRECTION COL2ROW 49#define DIODE_DIRECTION COL2ROW
50
51#define BACKLIGHT_PIN B7 50#define BACKLIGHT_PIN B7
51#ifdef BACKLIGHT_PIN
52#define BACKLIGHT_BREATHING 52#define BACKLIGHT_BREATHING
53#define BACKLIGHT_LEVELS 3 53#define BACKLIGHT_LEVELS 3
54 54#endif
55#define RGB_DI_PIN F0 55#define RGB_DI_PIN F0
56#ifdef RGB_DI_PIN 56#ifdef RGB_DI_PIN
57#define RGBLIGHT_ANIMATIONS 57#define RGBLIGHT_ANIMATIONS
@@ -59,6 +59,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
59#define RGBLIGHT_HUE_STEP 12 59#define RGBLIGHT_HUE_STEP 12
60#define RGBLIGHT_SAT_STEP 12 60#define RGBLIGHT_SAT_STEP 12
61#define RGBLIGHT_VAL_STEP 12 61#define RGBLIGHT_VAL_STEP 12
62#define RGBLIGHT_SLEEP
62#endif 63#endif
63 64
64/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ 65/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/kbdfans/kbd75/config.h b/keyboards/kbdfans/kbd75/config.h
index 83fd8cbda..09ef6a2f3 100644
--- a/keyboards/kbdfans/kbd75/config.h
+++ b/keyboards/kbdfans/kbd75/config.h
@@ -44,6 +44,7 @@
44#define RGBLIGHT_HUE_STEP 8 44#define RGBLIGHT_HUE_STEP 8
45#define RGBLIGHT_SAT_STEP 8 45#define RGBLIGHT_SAT_STEP 8
46#define RGBLIGHT_VAL_STEP 8 46#define RGBLIGHT_VAL_STEP 8
47#define RGBLIGHT_SLEEP
47/* If defined, the RGB lighting will be switched off when the host goes to sleep */ 48/* If defined, the RGB lighting will be switched off when the host goes to sleep */
48#define RGBLIGHT_SLEEP 49#define RGBLIGHT_SLEEP
49#endif 50#endif
diff --git a/keyboards/kbdfans/kbd8x/config.h b/keyboards/kbdfans/kbd8x/config.h
index bdd310440..5c1627494 100644
--- a/keyboards/kbdfans/kbd8x/config.h
+++ b/keyboards/kbdfans/kbd8x/config.h
@@ -47,11 +47,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
47 47
48/* COL2ROW, ROW2COL*/ 48/* COL2ROW, ROW2COL*/
49#define DIODE_DIRECTION COL2ROW 49#define DIODE_DIRECTION COL2ROW
50
51#define BACKLIGHT_PIN B6 50#define BACKLIGHT_PIN B6
51#ifdef BACKLIGHT_PIN
52#define BACKLIGHT_BREATHING 52#define BACKLIGHT_BREATHING
53#define BACKLIGHT_LEVELS 3 53#define BACKLIGHT_LEVELS 3
54 54#endif
55#define RGB_DI_PIN E2 55#define RGB_DI_PIN E2
56#ifdef RGB_DI_PIN 56#ifdef RGB_DI_PIN
57#define RGBLIGHT_ANIMATIONS 57#define RGBLIGHT_ANIMATIONS
@@ -59,6 +59,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
59#define RGBLIGHT_HUE_STEP 8 59#define RGBLIGHT_HUE_STEP 8
60#define RGBLIGHT_SAT_STEP 8 60#define RGBLIGHT_SAT_STEP 8
61#define RGBLIGHT_VAL_STEP 8 61#define RGBLIGHT_VAL_STEP 8
62#define RGBLIGHT_SLEEP
62#endif 63#endif
63 64
64/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ 65/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/kbdfans/kbd8x_mk2/config.h b/keyboards/kbdfans/kbd8x_mk2/config.h
index 4c6900b6c..3e07ad60c 100644
--- a/keyboards/kbdfans/kbd8x_mk2/config.h
+++ b/keyboards/kbdfans/kbd8x_mk2/config.h
@@ -52,11 +52,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
52 * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. 52 * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
53 */ 53 */
54#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 54#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
55
56#define BACKLIGHT_PIN B7 55#define BACKLIGHT_PIN B7
56#ifdef BACKLIGHT_PIN
57#define BACKLIGHT_BREATHING 57#define BACKLIGHT_BREATHING
58#define BACKLIGHT_LEVELS 3 58#define BACKLIGHT_LEVELS 3
59 59#endif
60#define RGB_DI_PIN B3 60#define RGB_DI_PIN B3
61#ifdef RGB_DI_PIN 61#ifdef RGB_DI_PIN
62 #define RGBLED_NUM 20 62 #define RGBLED_NUM 20
diff --git a/keyboards/kbdfans/kbdmini/config.h b/keyboards/kbdfans/kbdmini/config.h
new file mode 100644
index 000000000..0fc7b5acb
--- /dev/null
+++ b/keyboards/kbdfans/kbdmini/config.h
@@ -0,0 +1,47 @@
1#pragma once
2
3#include "config_common.h"
4
5/* USB Device descriptor parameter */
6#define VENDOR_ID 0xFEED
7#define PRODUCT_ID 0x2001
8#define DEVICE_VER 0x0001
9#define MANUFACTURER DZTECH
10
11#define PRODUCT KBDMINI
12#define DESCRIPTION KBDMINI RGB keyboard
13#define MATRIX_ROWS 4
14#define MATRIX_COLS 13
15
16#define MATRIX_ROW_PINS {B7, E6, F5, F4}
17#define MATRIX_COL_PINS {B3, B2, B1, B0, F1, F0, C6, B6, B5, B4, D7, D6, D4}
18#define UNUSED_PINS
19#define DIODE_DIRECTION COL2ROW
20
21#define DEBOUNCE 3
22#ifdef RGB_MATRIX_ENABLE
23#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
24#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
25#define RGB_MATRIX_KEYPRESSES
26#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
27#define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
28#define DISABLE_RGB_MATRIX_BAND_SAT
29#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
30#define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT
31#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
32#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
33#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
34#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
35#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
36#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
37#define DISABLE_RGB_MATRIX_SPLASH
38#define DISABLE_RGB_MATRIX_MULTISPLASH
39#define DISABLE_RGB_MATRIX_SOLID_SPLASH
40#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
41#define DISABLE_RGB_MATRIX_DIGITAL_RAIN
42#define DRIVER_ADDR_1 0b1010000
43#define DRIVER_ADDR_2 0b1010000 // this is here for compliancy reasons.
44#define DRIVER_COUNT 2
45#define DRIVER_1_LED_TOTAL 52
46#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
47#endif \ No newline at end of file
diff --git a/keyboards/kbdfans/kbdmini/kbdmini.c b/keyboards/kbdfans/kbdmini/kbdmini.c
new file mode 100644
index 000000000..b402eed64
--- /dev/null
+++ b/keyboards/kbdfans/kbdmini/kbdmini.c
@@ -0,0 +1,96 @@
1#include "kbdmini.h"
2#include "config.h"
3const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
4 {0, B_9, A_9, C_9}, //LA33
5 {0, B_10, A_10, C_10}, //LA37
6 {0, B_11, A_11, C_11}, //LA41
7 {0, B_12, A_12, C_12}, //LA45
8 {0, B_13, A_13, C_13}, //LA49
9 {0, B_14, A_14, C_14}, //LA53
10 {0, B_15, A_15, C_15}, //LA57
11 {0, B_6, A_6, C_6}, //LA21
12 {0, B_5, A_5, C_5}, //LA17
13 {0, B_4, A_4, C_4}, //LA13
14 {0, B_3, A_3, C_3}, //LA9
15 {0, B_2, A_2, C_2}, //LA5
16 {0, B_1, A_1, C_1}, //LA1
17
18 {0, E_9, D_9, F_9}, //LA34
19 {0, E_10, D_10, F_10}, //LA38
20 {0, E_11, D_11, F_11}, //LA42
21 {0, E_12, D_12, F_12}, //LA46
22 {0, E_13, D_13, F_13}, //LA50
23 {0, E_14, D_14, F_14}, //LA54
24 {0, E_15, D_15, F_15}, //LA58
25 {0, E_6, D_6, F_6}, //LA22
26 {0, E_5, D_5, F_5}, //LA18
27 {0, E_4, D_4, F_4}, //LA14
28 {0, E_3, D_3, F_3}, //LA10
29 {0, E_2, D_2, F_2}, //LA6
30 {0, E_1, D_1, F_1}, //LA2
31
32 {0, H_9, G_9, I_9}, //LA35
33 {0, H_10, G_10, I_10}, //LA39
34 {0, H_11, G_11, I_11}, //LA43
35 {0, H_12, G_12, I_12}, //LA47
36 {0, H_13, G_13, I_13}, //LA51
37 {0, H_14, G_14, I_14}, //LA55
38 {0, H_15, G_15, I_15}, //LA59
39 {0, H_6, G_6, I_6}, //LA23
40 {0, H_5, G_5, I_5}, //LA19
41 {0, H_4, G_4, I_4}, //LA15
42 {0, H_3, G_3, I_3}, //LA11
43 {0, H_2, G_2, I_2}, //LA7
44 {0, H_1, G_1, I_1}, //LA3
45
46 {0, K_9, J_9, L_9}, //LA36
47 {0, K_10, J_10, L_10}, //LA40
48 {0, K_11, J_11, L_11}, //LA44
49 {0, K_12, J_12, L_12}, //LA48
50 {0, K_13, J_13, L_13}, //LA52
51 {0, K_14, J_14, L_14}, //LA56
52 {0, K_15, J_15, L_15}, //LA60
53 {0, K_6, J_6, L_6}, //LA24
54 {0, K_5, J_5, L_5}, //LA20
55 {0, K_4, J_4, L_4}, //LA16
56 {0, K_3, J_3, L_3}, //LA12
57 {0, K_2, J_2, L_2}, //LA8
58 {0, K_1, J_1, L_1}//LA4
59};
60
61led_config_t g_led_config = { {
62 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12},
63 { 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25},
64 { 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38},
65 { 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51}
66}, {
67 { 0, 0 }, { 19, 0 }, { 38, 0 }, { 57, 0 }, { 76, 0 }, { 95, 0 }, { 114, 0 }, { 133, 0 }, { 152, 0 }, { 171, 0 }, { 190, 0 }, { 209, 0 }, { 224, 0 },
68 { 0, 21 }, { 19, 21 }, { 38, 21 }, { 57, 21 }, { 76, 21 }, { 95, 21 }, { 114, 21 }, { 133, 21 }, { 152, 21 }, { 171, 21 }, { 190, 21 }, { 209, 21 }, { 224, 21 },
69 { 0, 42 }, { 19, 42 }, { 38, 42 }, { 57, 42 }, { 76, 42 }, { 95, 42 }, { 114, 42 }, { 133, 42 }, { 152, 42 }, { 171, 42 }, { 190, 42 }, { 209, 42 }, { 224, 42 },
70 { 0, 64 }, { 19, 64 }, { 38, 64 }, { 57, 64 }, { 76, 64 }, { 95, 64 }, { 114, 64 }, { 133, 64 }, { 152, 64 }, { 171, 64 }, { 190, 64 }, { 209, 64 }, { 224, 64 }
71}, {
72 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
73 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
74 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
75 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
76} };
77void matrix_init_kb(void) {
78 matrix_init_user();
79}
80void matrix_scan_kb(void) {
81 matrix_scan_user();
82}
83bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
84 return process_record_user(keycode, record);
85}
86void suspend_power_down_kb(void)
87{
88 rgb_matrix_set_suspend_state(true);
89 suspend_power_down_user();
90}
91
92void suspend_wakeup_init_kb(void)
93{
94 rgb_matrix_set_suspend_state(false);
95 suspend_wakeup_init_user();
96}
diff --git a/keyboards/kbdfans/kbdmini/kbdmini.h b/keyboards/kbdfans/kbdmini/kbdmini.h
new file mode 100644
index 000000000..38596a569
--- /dev/null
+++ b/keyboards/kbdfans/kbdmini/kbdmini.h
@@ -0,0 +1,15 @@
1#pragma once
2#include "quantum.h"
3
4#define LAYOUT( \
5 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,\
6 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,\
7 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,\
8 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C \
9) { \
10 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
11 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \
12 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
13 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C } \
14}
15
diff --git a/keyboards/kbdfans/kbdmini/keymaps/default/keymap.c b/keyboards/kbdfans/kbdmini/keymaps/default/keymap.c
new file mode 100644
index 000000000..9c8267147
--- /dev/null
+++ b/keyboards/kbdfans/kbdmini/keymaps/default/keymap.c
@@ -0,0 +1,9 @@
1#include QMK_KEYBOARD_H
2#define _LAYER0 0
3const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
4 [_LAYER0] = LAYOUT(
5 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
6 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSPC,
7 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_ENT,
8 KC_F5, KC_CAPS, KC_LCTL, KC_LGUI, KC_F1, KC_SPC,KC_F2, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
9};
diff --git a/keyboards/kbdfans/kbdmini/readme.md b/keyboards/kbdfans/kbdmini/readme.md
new file mode 100644
index 000000000..e01684f13
--- /dev/null
+++ b/keyboards/kbdfans/kbdmini/readme.md
@@ -0,0 +1,13 @@
1# KBDMINI
2
3![KBDMINI](imgur.com image replace me!)
4
5Keyboard Maintainer: [DZTECH](https://github.com/moyi4681)
6Hardware Supported: KBDMINI
7Hardware Availability: [KBDFans](https://kbdfans.cn/)
8
9Make example for this keyboard (after setting up your build environment):
10
11 make kbdfans/kbdmini:default
12
13See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/kbdfans/kbdmini/rules.mk b/keyboards/kbdfans/kbdmini/rules.mk
new file mode 100644
index 000000000..28178d658
--- /dev/null
+++ b/keyboards/kbdfans/kbdmini/rules.mk
@@ -0,0 +1,33 @@
1# MCU name
2MCU = atmega32u4
3
4# Bootloader selection
5# Teensy halfkay
6# Pro Micro caterina
7# Atmel DFU atmel-dfu
8# LUFA DFU lufa-dfu
9# QMK DFU qmk-dfu
10# ATmega32A bootloadHID
11# ATmega328P USBasp
12BOOTLOADER = atmel-dfu
13
14# Build Options
15# change yes to no to disable
16#
17BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
18MOUSEKEY_ENABLE = yes # Mouse keys
19EXTRAKEY_ENABLE = yes # Audio control and System control
20CONSOLE_ENABLE = no # Console for debug
21COMMAND_ENABLE = no # Commands for debug and configuration
22# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
23SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
24# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
25NKRO_ENABLE = yes # USB Nkey Rollover
26BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
27MIDI_ENABLE = no # MIDI support
28UNICODE_ENABLE = no # Unicode
29BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
30AUDIO_ENABLE = no # Audio output on port C6
31FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
32RGB_MATRIX_ENABLE = IS31FL3733 # Use RGB matrix
33NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in
diff --git a/keyboards/kbdfans/kbdpad_mk2/config.h b/keyboards/kbdfans/kbdpad_mk2/config.h
index e3b91e1a1..a7dae0a70 100644
--- a/keyboards/kbdfans/kbdpad_mk2/config.h
+++ b/keyboards/kbdfans/kbdpad_mk2/config.h
@@ -54,9 +54,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
54#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 54#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
55 55
56#define BACKLIGHT_PIN B7 56#define BACKLIGHT_PIN B7
57#ifdef BACKLIGHT_PIN
57#define BACKLIGHT_BREATHING 58#define BACKLIGHT_BREATHING
58#define BACKLIGHT_LEVELS 5 59#define BACKLIGHT_LEVELS 5
59 60#endif
60#define RGB_DI_PIN B5 61#define RGB_DI_PIN B5
61#ifdef RGB_DI_PIN 62#ifdef RGB_DI_PIN
62 #define RGBLED_NUM 16 63 #define RGBLED_NUM 16
diff --git a/keyboards/xbows/knight/config.h b/keyboards/xbows/knight/config.h
index 6dc32db48..1e561642f 100644
--- a/keyboards/xbows/knight/config.h
+++ b/keyboards/xbows/knight/config.h
@@ -24,8 +24,10 @@
24/* number of backlight levels */ 24/* number of backlight levels */
25// #define BACKLIGHT_LEVELS 3 25// #define BACKLIGHT_LEVELS 3
26#define BACKLIGHT_PIN B7 26#define BACKLIGHT_PIN B7
27#ifdef BACKLIGHT_PIN
27#define BACKLIGHT_BREATHING 28#define BACKLIGHT_BREATHING
28#define BACKLIGHT_LEVELS 3 29#define BACKLIGHT_LEVELS 3
30#endif
29/* Set 0 if debouncing isn't needed */ 31/* Set 0 if debouncing isn't needed */
30#define DEBOUNCE 5 32#define DEBOUNCE 5
31 33
diff --git a/keyboards/xbows/woody/config.h b/keyboards/xbows/woody/config.h
index bf5903137..985f3acb1 100644
--- a/keyboards/xbows/woody/config.h
+++ b/keyboards/xbows/woody/config.h
@@ -12,7 +12,7 @@
12#define MATRIX_ROW_PINS {B3, B2, B1, B0, B5 } 12#define MATRIX_ROW_PINS {B3, B2, B1, B0, B5 }
13#define MATRIX_COL_PINS {B6, C6, C7, F4, F5, F6, F7, B7, D2, D3, D5, D4, D6, D7, B4 } 13#define MATRIX_COL_PINS {B6, C6, C7, F4, F5, F6, F7, B7, D2, D3, D5, D4, D6, D7, B4 }
14#define DIODE_DIRECTION COL2ROW 14#define DIODE_DIRECTION COL2ROW
15 15#ifdef RGB_MATRIX_ENABLE
16#define RGB_MATRIX_LED_PROCESS_LIMIT 4 16#define RGB_MATRIX_LED_PROCESS_LIMIT 4
17#define RGB_MATRIX_LED_FLUSH_LIMIT 26 17#define RGB_MATRIX_LED_FLUSH_LIMIT 26
18#define DEBOUNCE 3 18#define DEBOUNCE 3
@@ -41,3 +41,4 @@
41#define DRIVER_1_LED_TOTAL 35 41#define DRIVER_1_LED_TOTAL 35
42#define DRIVER_2_LED_TOTAL 32 42#define DRIVER_2_LED_TOTAL 32
43#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 43#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
44#endif \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-05 22:34:05 +0000