aboutsummaryrefslogtreecommitdiff
path: root/keyboards/keychron
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2022-01-26 21:16:09 -0800
committerGitHub <noreply@github.com>2022-01-26 21:16:09 -0800
commita211887978b5f2f1fef6cee42bb15c601d56c312 (patch)
tree20c3c58458da5eb9711ac032c05f5250a54d3170 /keyboards/keychron
parent52e12588c950e5bd19d3c0abbe6b5cc3da6d7c22 (diff)
downloadqmk_firmware-a211887978b5f2f1fef6cee42bb15c601d56c312.tar.gz
qmk_firmware-a211887978b5f2f1fef6cee42bb15c601d56c312.zip
Keychron QMK Configurator Refactor (#16034)
Diffstat (limited to 'keyboards/keychron')
-rw-r--r--keyboards/keychron/q1/rev_0101/info.json191
-rw-r--r--keyboards/keychron/q1/rev_0101/keymaps/default/info.json97
-rw-r--r--keyboards/keychron/q1/rev_0101/keymaps/via/info.json100
-rw-r--r--keyboards/keychron/q1/rev_0101/keymaps/via/keymap.c16
-rw-r--r--keyboards/keychron/q1/rev_0101/rev_0101.h4
-rw-r--r--keyboards/keychron/q2/rev_0110/info.json136
-rw-r--r--keyboards/keychron/q2/rev_0111/info.json159
-rw-r--r--keyboards/keychron/q2/rev_0111/keymaps/default/info.json82
-rw-r--r--keyboards/keychron/q2/rev_0111/keymaps/via/info.json84
-rw-r--r--keyboards/keychron/q2/rev_0111/keymaps/via/keymap.c20
-rw-r--r--keyboards/keychron/q2/rev_0111/rev_0111.h4
-rw-r--r--keyboards/keychron/q2/rev_0112/info.json138
-rw-r--r--keyboards/keychron/q2/rev_0113/info.json161
-rw-r--r--keyboards/keychron/q2/rev_0113/keymaps/default/info.json83
-rw-r--r--keyboards/keychron/q2/rev_0113/keymaps/via/info.json85
-rw-r--r--keyboards/keychron/q2/rev_0113/keymaps/via/keymap.c20
-rw-r--r--keyboards/keychron/q2/rev_0113/rev_0113.h4
17 files changed, 682 insertions, 702 deletions
diff --git a/keyboards/keychron/q1/rev_0101/info.json b/keyboards/keychron/q1/rev_0101/info.json
new file mode 100644
index 000000000..75fb2d04e
--- /dev/null
+++ b/keyboards/keychron/q1/rev_0101/info.json
@@ -0,0 +1,191 @@
1{
2 "keyboard_name": "Keychron Q1",
3 "url": "https://github.com/Keychron",
4 "maintainer": "lalalademaxiya1",
5 "layouts": {
6 "LAYOUT_ansi_82": {
7 "layout": [
8 {"label":"Esc", "x":0, "y":0},
9 {"label":"F1", "x":1.25, "y":0},
10 {"label":"F2", "x":2.25, "y":0},
11 {"label":"F3", "x":3.25, "y":0},
12 {"label":"F4", "x":4.25, "y":0},
13 {"label":"F5", "x":5.5, "y":0},
14 {"label":"F6", "x":6.5, "y":0},
15 {"label":"F7", "x":7.5, "y":0},
16 {"label":"F8", "x":8.5, "y":0},
17 {"label":"F9", "x":9.75, "y":0},
18 {"label":"F10", "x":10.75, "y":0},
19 {"label":"F11", "x":11.75, "y":0},
20 {"label":"F12", "x":12.75, "y":0},
21 {"label":"Delete", "x":14, "y":0},
22 {"label":"Mute", "x":15.25, "y":0},
23
24 {"label":"`~", "x":0, "y":1.25},
25 {"label":"1!", "x":1, "y":1.25},
26 {"label":"2@", "x":2, "y":1.25},
27 {"label":"3#", "x":3, "y":1.25},
28 {"label":"4$", "x":4, "y":1.25},
29 {"label":"5%", "x":5, "y":1.25},
30 {"label":"6^", "x":6, "y":1.25},
31 {"label":"7&", "x":7, "y":1.25},
32 {"label":"8*", "x":8, "y":1.25},
33 {"label":"9(", "x":9, "y":1.25},
34 {"label":"0)", "x":10, "y":1.25},
35 {"label":"-_", "x":11, "y":1.25},
36 {"label":"=+", "x":12, "y":1.25},
37 {"label":"Backspace", "x":13, "y":1.25, "w":2},
38 {"label":"Page Up", "x":15.25, "y":1.25},
39
40 {"label":"Tab", "x":0, "y":2.25, "w":1.5},
41 {"label":"Q", "x":1.5, "y":2.25},
42 {"label":"W", "x":2.5, "y":2.25},
43 {"label":"E", "x":3.5, "y":2.25},
44 {"label":"R", "x":4.5, "y":2.25},
45 {"label":"T", "x":5.5, "y":2.25},
46 {"label":"Y", "x":6.5, "y":2.25},
47 {"label":"U", "x":7.5, "y":2.25},
48 {"label":"I", "x":8.5, "y":2.25},
49 {"label":"O", "x":9.5, "y":2.25},
50 {"label":"P", "x":10.5, "y":2.25},
51 {"label":"[{", "x":11.5, "y":2.25},
52 {"label":"]}", "x":12.5, "y":2.25},
53 {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
54 {"label":"Page Down", "x":15.25, "y":2.25},
55
56 {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
57 {"label":"A", "x":1.75, "y":3.25},
58 {"label":"S", "x":2.75, "y":3.25},
59 {"label":"D", "x":3.75, "y":3.25},
60 {"label":"F", "x":4.75, "y":3.25},
61 {"label":"G", "x":5.75, "y":3.25},
62 {"label":"H", "x":6.75, "y":3.25},
63 {"label":"J", "x":7.75, "y":3.25},
64 {"label":"K", "x":8.75, "y":3.25},
65 {"label":"L", "x":9.75, "y":3.25},
66 {"label":";:", "x":10.75, "y":3.25},
67 {"label":"'\"", "x":11.75, "y":3.25},
68 {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
69 {"label":"Home", "x":15.25, "y":3.25},
70
71 {"label":"Shift", "x":0, "y":4.25, "w":2.25},
72 {"label":"Z", "x":2.25, "y":4.25},
73 {"label":"X", "x":3.25, "y":4.25},
74 {"label":"C", "x":4.25, "y":4.25},
75 {"label":"V", "x":5.25, "y":4.25},
76 {"label":"B", "x":6.25, "y":4.25},
77 {"label":"N", "x":7.25, "y":4.25},
78 {"label":"M", "x":8.25, "y":4.25},
79 {"label":",<", "x":9.25, "y":4.25},
80 {"label":".>", "x":10.25, "y":4.25},
81 {"label":"/?", "x":11.25, "y":4.25},
82 {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
83 {"label":"Up", "x":14.25, "y":4.5},
84
85 {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
86 {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
87 {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
88 {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
89 {"label":"Alt", "x":10, "y":5.25},
90 {"label":"Fn", "x":11, "y":5.25},
91 {"label":"Ctrl", "x":12, "y":5.25},
92 {"label":"Left", "x":13.25, "y":5.5},
93 {"label":"Down", "x":14.25, "y":5.5},
94 {"label":"Right", "x":15.25, "y":5.5}
95 ]
96 },
97 "LAYOUT_all": {
98 "layout": [
99 {"label":"Esc", "x":0, "y":0.5},
100 {"label":"F1", "x":1.25, "y":0.5},
101 {"label":"F2", "x":2.25, "y":0.5},
102 {"label":"F3", "x":3.25, "y":0.5},
103 {"label":"F4", "x":4.25, "y":0.5},
104 {"label":"F5", "x":5.5, "y":0.5},
105 {"label":"F6", "x":6.5, "y":0.5},
106 {"label":"F7", "x":7.5, "y":0.5},
107 {"label":"F8", "x":8.5, "y":0.5},
108 {"label":"F9", "x":9.75, "y":0.5},
109 {"label":"F10", "x":10.75, "y":0.5},
110 {"label":"F11", "x":11.75, "y":0.5},
111 {"label":"F12", "x":12.75, "y":0.5},
112 {"label":"Delete", "x":14, "y":0.5},
113 {"label":"CCW", "x":15.15, "y":0, "w":0.6, "h":0.5},
114 {"label":"Mute", "x":15.25, "y":0.5},
115 {"label":"CW", "x":15.75, "y":0, "w":0.6, "h":0.5},
116
117 {"label":"`~", "x":0, "y":1.75},
118 {"label":"1!", "x":1, "y":1.75},
119 {"label":"2@", "x":2, "y":1.75},
120 {"label":"3#", "x":3, "y":1.75},
121 {"label":"4$", "x":4, "y":1.75},
122 {"label":"5%", "x":5, "y":1.75},
123 {"label":"6^", "x":6, "y":1.75},
124 {"label":"7&", "x":7, "y":1.75},
125 {"label":"8*", "x":8, "y":1.75},
126 {"label":"9(", "x":9, "y":1.75},
127 {"label":"0)", "x":10, "y":1.75},
128 {"label":"-_", "x":11, "y":1.75},
129 {"label":"=+", "x":12, "y":1.75},
130 {"label":"Backspace", "x":13, "y":1.75, "w":2},
131 {"label":"Page Up", "x":15.25, "y":1.75},
132
133 {"label":"Tab", "x":0, "y":2.75, "w":1.5},
134 {"label":"Q", "x":1.5, "y":2.75},
135 {"label":"W", "x":2.5, "y":2.75},
136 {"label":"E", "x":3.5, "y":2.75},
137 {"label":"R", "x":4.5, "y":2.75},
138 {"label":"T", "x":5.5, "y":2.75},
139 {"label":"Y", "x":6.5, "y":2.75},
140 {"label":"U", "x":7.5, "y":2.75},
141 {"label":"I", "x":8.5, "y":2.75},
142 {"label":"O", "x":9.5, "y":2.75},
143 {"label":"P", "x":10.5, "y":2.75},
144 {"label":"[{", "x":11.5, "y":2.75},
145 {"label":"]}", "x":12.5, "y":2.75},
146 {"label":"\\|", "x":13.5, "y":2.75, "w":1.5},
147 {"label":"Page Down", "x":15.25, "y":2.75},
148
149 {"label":"Caps Lock", "x":0, "y":3.75, "w":1.75},
150 {"label":"A", "x":1.75, "y":3.75},
151 {"label":"S", "x":2.75, "y":3.75},
152 {"label":"D", "x":3.75, "y":3.75},
153 {"label":"F", "x":4.75, "y":3.75},
154 {"label":"G", "x":5.75, "y":3.75},
155 {"label":"H", "x":6.75, "y":3.75},
156 {"label":"J", "x":7.75, "y":3.75},
157 {"label":"K", "x":8.75, "y":3.75},
158 {"label":"L", "x":9.75, "y":3.75},
159 {"label":";:", "x":10.75, "y":3.75},
160 {"label":"'\"", "x":11.75, "y":3.75},
161 {"label":"Enter", "x":12.75, "y":3.75, "w":2.25},
162 {"label":"Home", "x":15.25, "y":3.75},
163
164 {"label":"Shift", "x":0, "y":4.75, "w":2.25},
165 {"label":"Z", "x":2.25, "y":4.75},
166 {"label":"X", "x":3.25, "y":4.75},
167 {"label":"C", "x":4.25, "y":4.75},
168 {"label":"V", "x":5.25, "y":4.75},
169 {"label":"B", "x":6.25, "y":4.75},
170 {"label":"N", "x":7.25, "y":4.75},
171 {"label":"M", "x":8.25, "y":4.75},
172 {"label":",<", "x":9.25, "y":4.75},
173 {"label":".>", "x":10.25, "y":4.75},
174 {"label":"/?", "x":11.25, "y":4.75},
175 {"label":"Shift", "x":12.25, "y":4.75, "w":1.75},
176 {"label":"Up", "x":14.25, "y":5},
177
178 {"label":"Ctrl", "x":0, "y":5.75, "w":1.25},
179 {"label":"Win", "x":1.25, "y":5.75, "w":1.25},
180 {"label":"Alt", "x":2.5, "y":5.75, "w":1.25},
181 {"label":"Space", "x":3.75, "y":5.75, "w":6.25},
182 {"label":"Alt", "x":10, "y":5.75},
183 {"label":"Fn", "x":11, "y":5.75},
184 {"label":"Ctrl", "x":12, "y":5.75},
185 {"label":"Left", "x":13.25, "y":6},
186 {"label":"Down", "x":14.25, "y":6},
187 {"label":"Right", "x":15.25, "y":6}
188 ]
189 }
190 }
191}
diff --git a/keyboards/keychron/q1/rev_0101/keymaps/default/info.json b/keyboards/keychron/q1/rev_0101/keymaps/default/info.json
deleted file mode 100644
index 56bf48acc..000000000
--- a/keyboards/keychron/q1/rev_0101/keymaps/default/info.json
+++ /dev/null
@@ -1,97 +0,0 @@
1{
2 "keyboard_name": "Keychron Q1",
3 "url": "https://github.com/Keychron",
4 "maintainer": "lalalademaxiya1",
5 "layouts": {
6 "LAYOUT_ansi_82": {
7 "layout": [
8 {"label":"Esc", "x":0, "y":0},
9 {"label":"F1", "x":1.25, "y":0},
10 {"label":"F2", "x":2.25, "y":0},
11 {"label":"F3", "x":3.25, "y":0},
12 {"label":"F4", "x":4.25, "y":0},
13 {"label":"F5", "x":5.5, "y":0},
14 {"label":"F6", "x":6.5, "y":0},
15 {"label":"F7", "x":7.5, "y":0},
16 {"label":"F8", "x":8.5, "y":0},
17 {"label":"F9", "x":9.75, "y":0},
18 {"label":"F10", "x":10.75, "y":0},
19 {"label":"F11", "x":11.75, "y":0},
20 {"label":"F12", "x":12.75, "y":0},
21 {"label":"Delete", "x":14, "y":0},
22 {"label":"Mute", "x":15.25, "y":0},
23
24 {"label":"~", "x":0, "y":1.25},
25 {"label":"!", "x":1, "y":1.25},
26 {"label":"@", "x":2, "y":1.25},
27 {"label":"#", "x":3, "y":1.25},
28 {"label":"$", "x":4, "y":1.25},
29 {"label":"%", "x":5, "y":1.25},
30 {"label":"^", "x":6, "y":1.25},
31 {"label":"&", "x":7, "y":1.25},
32 {"label":"*", "x":8, "y":1.25},
33 {"label":"(", "x":9, "y":1.25},
34 {"label":")", "x":10, "y":1.25},
35 {"label":"_", "x":11, "y":1.25},
36 {"label":"+", "x":12, "y":1.25},
37 {"label":"Backspace", "x":13, "y":1.25, "w":2},
38 {"label":"Page Up", "x":15.25, "y":1.25},
39
40 {"label":"Tab", "x":0, "y":2.25, "w":1.5},
41 {"label":"Q", "x":1.5, "y":2.25},
42 {"label":"W", "x":2.5, "y":2.25},
43 {"label":"E", "x":3.5, "y":2.25},
44 {"label":"R", "x":4.5, "y":2.25},
45 {"label":"T", "x":5.5, "y":2.25},
46 {"label":"Y", "x":6.5, "y":2.25},
47 {"label":"U", "x":7.5, "y":2.25},
48 {"label":"I", "x":8.5, "y":2.25},
49 {"label":"O", "x":9.5, "y":2.25},
50 {"label":"P", "x":10.5, "y":2.25},
51 {"label":"{", "x":11.5, "y":2.25},
52 {"label":"}", "x":12.5, "y":2.25},
53 {"label":"|", "x":13.5, "y":2.25, "w":1.5},
54 {"label":"Page Down", "x":15.25, "y":2.25},
55
56 {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
57 {"label":"A", "x":1.75, "y":3.25},
58 {"label":"S", "x":2.75, "y":3.25},
59 {"label":"D", "x":3.75, "y":3.25},
60 {"label":"F", "x":4.75, "y":3.25},
61 {"label":"G", "x":5.75, "y":3.25},
62 {"label":"H", "x":6.75, "y":3.25},
63 {"label":"J", "x":7.75, "y":3.25},
64 {"label":"K", "x":8.75, "y":3.25},
65 {"label":"L", "x":9.75, "y":3.25},
66 {"label":":", "x":10.75, "y":3.25},
67 {"label":"\"", "x":11.75, "y":3.25},
68 {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
69 {"label":"Home", "x":15.25, "y":3.25},
70
71 {"label":"Shift", "x":0, "y":4.25, "w":2.25},
72 {"label":"Z", "x":2.25, "y":4.25},
73 {"label":"X", "x":3.25, "y":4.25},
74 {"label":"C", "x":4.25, "y":4.25},
75 {"label":"V", "x":5.25, "y":4.25},
76 {"label":"B", "x":6.25, "y":4.25},
77 {"label":"N", "x":7.25, "y":4.25},
78 {"label":"M", "x":8.25, "y":4.25},
79 {"label":"<", "x":9.25, "y":4.25},
80 {"label":">", "x":10.25, "y":4.25},
81 {"label":"?", "x":11.25, "y":4.25},
82 {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
83 {"label":"Up", "x":14.25, "y":4.5},
84
85 {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
86 {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
87 {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
88 {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
89 {"label":"Alt", "x":10, "y":5.25},
90 {"label":"Fn", "x":11, "y":5.25},
91 {"label":"Ctrl", "x":12, "y":5.25},
92 {"label":"Left", "x":13.25, "y":5.5},
93 {"label":"Down", "x":14.25, "y":5.5},
94 {"label":"Right", "x":15.25, "y":5.5} ]
95 }
96 }
97} \ No newline at end of file
diff --git a/keyboards/keychron/q1/rev_0101/keymaps/via/info.json b/keyboards/keychron/q1/rev_0101/keymaps/via/info.json
deleted file mode 100644
index a921ee3e4..000000000
--- a/keyboards/keychron/q1/rev_0101/keymaps/via/info.json
+++ /dev/null
@@ -1,100 +0,0 @@
1{
2 "keyboard_name": "Keychron Q1",
3 "url": "https://github.com/Keychron",
4 "maintainer": "lalalademaxiya1",
5 "layouts": {
6 "LAYOUT_all": {
7 "layout": [
8 {"label":"Esc", "x":0, "y":0},
9 {"label":"F1", "x":1.25, "y":0},
10 {"label":"F2", "x":2.25, "y":0},
11 {"label":"F3", "x":3.25, "y":0},
12 {"label":"F4", "x":4.25, "y":0},
13 {"label":"F5", "x":5.5, "y":0},
14 {"label":"F6", "x":6.5, "y":0},
15 {"label":"F7", "x":7.5, "y":0},
16 {"label":"F8", "x":8.5, "y":0},
17 {"label":"F9", "x":9.75, "y":0},
18 {"label":"F10", "x":10.75, "y":0},
19 {"label":"F11", "x":11.75, "y":0},
20 {"label":"F12", "x":12.75, "y":0},
21 {"label":"Delete", "x":14, "y":0},
22
23 {"label":"Mute", "x":15.25, "y":0, "w":0.75},
24 {"label":"Vol-", "x":16, "y":0, "w":0.75, "h":0.5},
25 {"label":"Vol+", "x":16, "y":0.5, "w":0.75, "h":0.5},
26
27 {"label":"~", "x":0, "y":1.25},
28 {"label":"!", "x":1, "y":1.25},
29 {"label":"@", "x":2, "y":1.25},
30 {"label":"#", "x":3, "y":1.25},
31 {"label":"$", "x":4, "y":1.25},
32 {"label":"%", "x":5, "y":1.25},
33 {"label":"^", "x":6, "y":1.25},
34 {"label":"&", "x":7, "y":1.25},
35 {"label":"*", "x":8, "y":1.25},
36 {"label":"(", "x":9, "y":1.25},
37 {"label":")", "x":10, "y":1.25},
38 {"label":"_", "x":11, "y":1},
39 {"label":"+", "x":12, "y":1.25},
40 {"label":"Backspace", "x":13, "y":1.25, "w":2},
41 {"label":"Page Up", "x":15.25, "y":1.25},
42
43 {"label":"Tab", "x":0, "y":2.25, "w":1.5},
44 {"label":"Q", "x":1.5, "y":2.25},
45 {"label":"W", "x":2.5, "y":2.25},
46 {"label":"E", "x":3.5, "y":2.25},
47 {"label":"R", "x":4.5, "y":2.25},
48 {"label":"T", "x":5.5, "y":2.25},
49 {"label":"Y", "x":6.5, "y":2.25},
50 {"label":"U", "x":7.5, "y":2.25},
51 {"label":"I", "x":8.5, "y":2.25},
52 {"label":"O", "x":9.5, "y":2.25},
53 {"label":"P", "x":10.5, "y":2.25},
54 {"label":"{", "x":11.5, "y":2.25},
55 {"label":"}", "x":12.5, "y":2.25},
56 {"label":"|", "x":13.5, "y":2.25, "w":1.5},
57 {"label":"Page Down", "x":15.25, "y":2.25},
58
59 {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
60 {"label":"A", "x":1.75, "y":3.25},
61 {"label":"S", "x":2.75, "y":3.25},
62 {"label":"D", "x":3.75, "y":3.25},
63 {"label":"F", "x":4.75, "y":3.25},
64 {"label":"G", "x":5.75, "y":3.25},
65 {"label":"H", "x":6.75, "y":3.25},
66 {"label":"J", "x":7.75, "y":3.25},
67 {"label":"K", "x":8.75, "y":3.25},
68 {"label":"L", "x":9.75, "y":3.25},
69 {"label":":", "x":10.75, "y":3.25},
70 {"label":"\"", "x":11.75, "y":3.25},
71 {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
72 {"label":"Home", "x":15.25, "y":3.25},
73
74 {"label":"Shift", "x":0, "y":4.25, "w":2.25},
75 {"label":"Z", "x":2.25, "y":4.25},
76 {"label":"X", "x":3.25, "y":4.25},
77 {"label":"C", "x":4.25, "y":4.25},
78 {"label":"V", "x":5.25, "y":4.25},
79 {"label":"B", "x":6.25, "y":4.25},
80 {"label":"N", "x":7.25, "y":4.25},
81 {"label":"M", "x":8.25, "y":4.25},
82 {"label":"<", "x":9.25, "y":4.25},
83 {"label":">", "x":10.25, "y":4.25},
84 {"label":"?", "x":11.25, "y":4.25},
85 {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
86 {"label":"Up", "x":14.25, "y":4.5},
87
88 {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
89 {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
90 {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
91 {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
92 {"label":"Alt", "x":10, "y":5.25},
93 {"label":"Fn", "x":11, "y":5.25},
94 {"label":"Ctrl", "x":12, "y":5.25},
95 {"label":"Left", "x":13.25, "y":5.5},
96 {"label":"Down", "x":14.25, "y":5.5},
97 {"label":"Right", "x":15.25, "y":5.5} ]
98 }
99 }
100}
diff --git a/keyboards/keychron/q1/rev_0101/keymaps/via/keymap.c b/keyboards/keychron/q1/rev_0101/keymaps/via/keymap.c
index 1103f7442..ad053648e 100644
--- a/keyboards/keychron/q1/rev_0101/keymaps/via/keymap.c
+++ b/keyboards/keychron/q1/rev_0101/keymaps/via/keymap.c
@@ -35,36 +35,36 @@ enum custom_keycodes {
35 35
36const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 36const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
37 [MAC_BASE] = LAYOUT_all( 37 [MAC_BASE] = LAYOUT_all(
38 KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, KC_MUTE, 38 KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, KC_VOLD, KC_MUTE, KC_VOLU,
39 KC_GRV, 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, KC_PGUP, 39 KC_GRV, 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, KC_PGUP,
40 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_BSLS, KC_PGDN, 40 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_BSLS, KC_PGDN,
41 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, KC_HOME, 41 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, KC_HOME,
42 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, 42 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
43 KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_VOLD, KC_VOLU, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), 43 KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
44 44
45 [MAC_FN] = LAYOUT_all( 45 [MAC_FN] = LAYOUT_all(
46 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_TRNS, KC_TRNS, 46 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
47 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, KC_TRNS, KC_TRNS, 47 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, KC_TRNS, KC_TRNS,
48 RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 48 RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
49 KC_TRNS, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 49 KC_TRNS, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
50 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, 50 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,
51 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 51 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
52 52
53 [WIN_BASE] = LAYOUT_all( 53 [WIN_BASE] = LAYOUT_all(
54 KC_ESC, 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_MUTE, 54 KC_ESC, 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_VOLD, KC_MUTE, KC_VOLU,
55 KC_GRV, 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, KC_PGUP, 55 KC_GRV, 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, KC_PGUP,
56 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_BSLS, KC_PGDN, 56 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_BSLS, KC_PGDN,
57 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, KC_HOME, 57 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, KC_HOME,
58 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, 58 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
59 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_VOLD, KC_VOLU, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), 59 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
60 60
61 [WIN_FN] = LAYOUT_all( 61 [WIN_FN] = LAYOUT_all(
62 KC_TRNS, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, 62 KC_TRNS, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
63 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, KC_TRNS, KC_TRNS, 63 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, KC_TRNS, KC_TRNS,
64 RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 64 RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
65 KC_TRNS, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 65 KC_TRNS, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
66 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, 66 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,
67 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) 67 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
68}; 68};
69 69
70#if defined(VIA_ENABLE) && defined(ENCODER_ENABLE) 70#if defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
diff --git a/keyboards/keychron/q1/rev_0101/rev_0101.h b/keyboards/keychron/q1/rev_0101/rev_0101.h
index 132003c4f..e4e8205b7 100644
--- a/keyboards/keychron/q1/rev_0101/rev_0101.h
+++ b/keyboards/keychron/q1/rev_0101/rev_0101.h
@@ -21,12 +21,12 @@
21#define xxx KC_NO 21#define xxx KC_NO
22 22
23#define LAYOUT_all( \ 23#define LAYOUT_all( \
24 K00, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4E, K0E, \ 24 K00, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4E, K57, K0E, K58, \
25 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ 25 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
26 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ 26 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
27 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \ 27 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
28 K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K3C, \ 28 K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K3C, \
29 K50, K51, K52, K56, K57, K58, K5A, K5B, K5C, K5D, K4C, K5E \ 29 K50, K51, K52, K56, K5A, K5B, K5C, K5D, K4C, K5E \
30 ) { \ 30 ) { \
31 { K00, xxx, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ 31 { K00, xxx, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
32 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ 32 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
diff --git a/keyboards/keychron/q2/rev_0110/info.json b/keyboards/keychron/q2/rev_0110/info.json
index caf3ebf7c..fb34a2427 100644
--- a/keyboards/keychron/q2/rev_0110/info.json
+++ b/keyboards/keychron/q2/rev_0110/info.json
@@ -5,78 +5,78 @@
5 "layouts": { 5 "layouts": {
6 "LAYOUT_ansi_67": { 6 "LAYOUT_ansi_67": {
7 "layout": [ 7 "layout": [
8 {"label":"Insert", "x":15.25, "y":0}, 8 {"label":"Esc", "x":0, "y":0.25},
9 {"label":"1!", "x":1, "y":0.25},
10 {"label":"2@", "x":2, "y":0.25},
11 {"label":"3#", "x":3, "y":0.25},
12 {"label":"4$", "x":4, "y":0.25},
13 {"label":"5%", "x":5, "y":0.25},
14 {"label":"6^", "x":6, "y":0.25},
15 {"label":"7&", "x":7, "y":0.25},
16 {"label":"8*", "x":8, "y":0.25},
17 {"label":"9(", "x":9, "y":0.25},
18 {"label":"0)", "x":10, "y":0.25},
19 {"label":"-_", "x":11, "y":0.25},
20 {"label":"=+", "x":12, "y":0.25},
21 {"label":"Backspace", "x":13, "y":0.25, "w":2},
22 {"label":"Insert", "x":15.25, "y":0},
9 23
10 {"label":"Esc", "x":0, "y":0.25}, 24 {"label":"Tab", "x":0, "y":1.25, "w":1.5},
11 {"label":"!", "x":1, "y":0.25}, 25 {"label":"Q", "x":1.5, "y":1.25},
12 {"label":"@", "x":2, "y":0.25}, 26 {"label":"W", "x":2.5, "y":1.25},
13 {"label":"", "x":3, "y":0.25}, 27 {"label":"E", "x":3.5, "y":1.25},
14 {"label":"$", "x":4, "y":0.25}, 28 {"label":"R", "x":4.5, "y":1.25},
15 {"label":"%", "x":5, "y":0.25}, 29 {"label":"T", "x":5.5, "y":1.25},
16 {"label":"^", "x":6, "y":0.25}, 30 {"label":"Y", "x":6.5, "y":1.25},
17 {"label":"&", "x":7, "y":0.25}, 31 {"label":"U", "x":7.5, "y":1.25},
18 {"label":"*", "x":8, "y":0.25}, 32 {"label":"I", "x":8.5, "y":1.25},
19 {"label":"(", "x":9, "y":0.25}, 33 {"label":"O", "x":9.5, "y":1.25},
20 {"label":")", "x":10, "y":0.25}, 34 {"label":"P", "x":10.5, "y":1.25},
21 {"label":"_", "x":11, "y":0.25}, 35 {"label":"[{", "x":11.5, "y":1.25},
22 {"label":"+", "x":12, "y":0.25}, 36 {"label":"]}", "x":12.5, "y":1.25},
23 {"label":"Backspace", "x":13, "y":0.25, "w":2}, 37 {"label":"\\|", "x":13.5, "y":1.25, "w":1.5},
38 {"label":"Delete", "x":15.25, "y":1.25},
24 39
25 {"label":"Tab", "x":0, "y":1.25, "w":1.5}, 40 {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
26 {"label":"Q", "x":1.5, "y":1.25}, 41 {"label":"A", "x":1.75, "y":2.25},
27 {"label":"W", "x":2.5, "y":1.25}, 42 {"label":"S", "x":2.75, "y":2.25},
28 {"label":"E", "x":3.5, "y":1.25}, 43 {"label":"D", "x":3.75, "y":2.25},
29 {"label":"R", "x":4.5, "y":1.25}, 44 {"label":"F", "x":4.75, "y":2.25},
30 {"label":"T", "x":5.5, "y":1.25}, 45 {"label":"G", "x":5.75, "y":2.25},
31 {"label":"Y", "x":6.5, "y":1.25}, 46 {"label":"H", "x":6.75, "y":2.25},
32 {"label":"U", "x":7.5, "y":1.25}, 47 {"label":"J", "x":7.75, "y":2.25},
33 {"label":"I", "x":8.5, "y":1.25}, 48 {"label":"K", "x":8.75, "y":2.25},
34 {"label":"O", "x":9.5, "y":1.25}, 49 {"label":"L", "x":9.75, "y":2.25},
35 {"label":"P", "x":10.5, "y":1.25}, 50 {"label":";:", "x":10.75, "y":2.25},
36 {"label":"{", "x":11.5, "y":1.25}, 51 {"label":"'\"", "x":11.75, "y":2.25},
37 {"label":"}", "x":12.5, "y":1.25}, 52 {"label":"Enter", "x":12.75, "y":2.25, "w":2.25},
38 {"label":"|", "x":13.5, "y":1.25, "w":1.5}, 53 {"label":"Home", "x":15.25, "y":2.25},
39 {"label":"Delete", "x":15.25, "y":1.25},
40 54
41 {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75}, 55 {"label":"Shift", "x":0, "y":3.25, "w":2.25},
42 {"label":"A", "x":1.75, "y":2.25}, 56 {"label":"Z", "x":2.25, "y":3.25},
43 {"label":"S", "x":2.75, "y":2.25}, 57 {"label":"X", "x":3.25, "y":3.25},
44 {"label":"D", "x":3.75, "y":2.25}, 58 {"label":"C", "x":4.25, "y":3.25},
45 {"label":"F", "x":4.75, "y":2.25}, 59 {"label":"V", "x":5.25, "y":3.25},
46 {"label":"G", "x":5.75, "y":2.25}, 60 {"label":"B", "x":6.25, "y":3.25},
47 {"label":"H", "x":6.75, "y":2.25}, 61 {"label":"N", "x":7.25, "y":3.25},
48 {"label":"J", "x":7.75, "y":2.25}, 62 {"label":"M", "x":8.25, "y":3.25},
49 {"label":"K", "x":8.75, "y":2.25}, 63 {"label":",<", "x":9.25, "y":3.25},
50 {"label":"L", "x":9.75, "y":2.25}, 64 {"label":".>", "x":10.25, "y":3.25},
51 {"label":":", "x":10.75, "y":2.25}, 65 {"label":"/?", "x":11.25, "y":3.25},
52 {"label":"\"", "x":11.75, "y":2.25}, 66 {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
53 {"label":"Enter", "x":12.75, "y":2.25, "w":2.25}, 67 {"label":"Up", "x":14.25, "y":3.5},
54 {"label":"Home", "x":15.25, "y":2.25},
55 68
56 {"label":"Shift", "x":0, "y":3.25, "w":2.25}, 69 {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
57 {"label":"Z", "x":2.25, "y":3.25}, 70 {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
58 {"label":"X", "x":3.25, "y":3.25}, 71 {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
59 {"label":"C", "x":4.25, "y":3.25}, 72 {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
60 {"label":"V", "x":5.25, "y":3.25}, 73 {"label":"Alt", "x":10, "y":4.25},
61 {"label":"B", "x":6.25, "y":3.25}, 74 {"label":"Fn1", "x":11, "y":4.25},
62 {"label":"N", "x":7.25, "y":3.25}, 75 {"label":"Fn2", "x":12, "y":4.25},
63 {"label":"M", "x":8.25, "y":3.25}, 76 {"label":"Left", "x":13.25, "y":4.5},
64 {"label":"<", "x":9.25, "y":3.25}, 77 {"label":"Down", "x":14.25, "y":4.5},
65 {"label":">", "x":10.25, "y":3.25}, 78 {"label":"Right", "x":15.25, "y":4.5}
66 {"label":"?", "x":11.25, "y":3.25}, 79 ]
67 {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
68 {"label":"Up", "x":14.25, "y":3.5},
69
70 {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
71 {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
72 {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
73 {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
74 {"label":"Alt", "x":10, "y":4.25},
75 {"label":"Fn1", "x":11, "y":4.25},
76 {"label":"Fn2", "x":12, "y":4.25},
77 {"label":"Left", "x":13.25, "y":4.5},
78 {"label":"Down", "x":14.25, "y":4.5},
79 {"label":"Right", "x":15.25, "y":4.5} ]
80 } 80 }
81 } 81 }
82} 82}
diff --git a/keyboards/keychron/q2/rev_0111/info.json b/keyboards/keychron/q2/rev_0111/info.json
new file mode 100644
index 000000000..f6ce1d9b2
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0111/info.json
@@ -0,0 +1,159 @@
1{
2 "keyboard_name": "Keychron Q2",
3 "url": "https://github.com/Keychron",
4 "maintainer": "lalalademaxiya1",
5 "layouts": {
6 "LAYOUT_ansi_67": {
7 "layout": [
8 {"label":"Esc", "x":0, "y":0.25},
9 {"label":"1!", "x":1, "y":0.25},
10 {"label":"2@", "x":2, "y":0.25},
11 {"label":"3#", "x":3, "y":0.25},
12 {"label":"4$", "x":4, "y":0.25},
13 {"label":"5%", "x":5, "y":0.25},
14 {"label":"6^", "x":6, "y":0.25},
15 {"label":"7&", "x":7, "y":0.25},
16 {"label":"8*", "x":8, "y":0.25},
17 {"label":"9(", "x":9, "y":0.25},
18 {"label":"0)", "x":10, "y":0.25},
19 {"label":"-_", "x":11, "y":0.25},
20 {"label":"=+", "x":12, "y":0.25},
21 {"label":"Backspace", "x":13, "y":0.25, "w":2},
22 {"label":"Mute", "x":15.25, "y":0},
23
24 {"label":"Tab", "x":0, "y":1.25, "w":1.5},
25 {"label":"Q", "x":1.5, "y":1.25},
26 {"label":"W", "x":2.5, "y":1.25},
27 {"label":"E", "x":3.5, "y":1.25},
28 {"label":"R", "x":4.5, "y":1.25},
29 {"label":"T", "x":5.5, "y":1.25},
30 {"label":"Y", "x":6.5, "y":1.25},
31 {"label":"U", "x":7.5, "y":1.25},
32 {"label":"I", "x":8.5, "y":1.25},
33 {"label":"O", "x":9.5, "y":1.25},
34 {"label":"P", "x":10.5, "y":1.25},
35 {"label":"[{", "x":11.5, "y":1.25},
36 {"label":"]}", "x":12.5, "y":1.25},
37 {"label":"\\|", "x":13.5, "y":1.25, "w":1.5},
38 {"label":"Delete", "x":15.25, "y":1.25},
39
40 {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
41 {"label":"A", "x":1.75, "y":2.25},
42 {"label":"S", "x":2.75, "y":2.25},
43 {"label":"D", "x":3.75, "y":2.25},
44 {"label":"F", "x":4.75, "y":2.25},
45 {"label":"G", "x":5.75, "y":2.25},
46 {"label":"H", "x":6.75, "y":2.25},
47 {"label":"J", "x":7.75, "y":2.25},
48 {"label":"K", "x":8.75, "y":2.25},
49 {"label":"L", "x":9.75, "y":2.25},
50 {"label":";:", "x":10.75, "y":2.25},
51 {"label":"'\"", "x":11.75, "y":2.25},
52 {"label":"Enter", "x":12.75, "y":2.25, "w":2.25},
53 {"label":"Home", "x":15.25, "y":2.25},
54
55 {"label":"Shift", "x":0, "y":3.25, "w":2.25},
56 {"label":"Z", "x":2.25, "y":3.25},
57 {"label":"X", "x":3.25, "y":3.25},
58 {"label":"C", "x":4.25, "y":3.25},
59 {"label":"V", "x":5.25, "y":3.25},
60 {"label":"B", "x":6.25, "y":3.25},
61 {"label":"N", "x":7.25, "y":3.25},
62 {"label":"M", "x":8.25, "y":3.25},
63 {"label":",<", "x":9.25, "y":3.25},
64 {"label":".>", "x":10.25, "y":3.25},
65 {"label":"/?", "x":11.25, "y":3.25},
66 {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
67 {"label":"Up", "x":14.25, "y":3.5},
68
69 {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
70 {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
71 {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
72 {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
73 {"label":"Alt", "x":10, "y":4.25},
74 {"label":"Fn1", "x":11, "y":4.25},
75 {"label":"Fn2", "x":12, "y":4.25},
76 {"label":"Left", "x":13.25, "y":4.5},
77 {"label":"Down", "x":14.25, "y":4.5},
78 {"label":"Right", "x":15.25, "y":4.5}
79 ]
80 },
81 "LAYOUT_all": {
82 "layout": [
83 {"label":"Esc", "x":0, "y":0.75},
84 {"label":"1!", "x":1, "y":0.75},
85 {"label":"2@", "x":2, "y":0.75},
86 {"label":"3#", "x":3, "y":0.75},
87 {"label":"4$", "x":4, "y":0.75},
88 {"label":"5%", "x":5, "y":0.75},
89 {"label":"6^", "x":6, "y":0.75},
90 {"label":"7&", "x":7, "y":0.75},
91 {"label":"8*", "x":8, "y":0.75},
92 {"label":"9(", "x":9, "y":0.75},
93 {"label":"0)", "x":10, "y":0.75},
94 {"label":"-_", "x":11, "y":0.75},
95 {"label":"=+", "x":12, "y":0.75},
96 {"label":"Backspace", "x":13, "y":0.75, "w":2},
97 {"label":"CCW", "x":15.15, "y":0, "w":0.6, "h":0.5},
98 {"label":"Mute", "x":15.25, "y":0.5},
99 {"label":"CW", "x":15.75, "y":0, "w":0.6, "h":0.5},
100
101 {"label":"Tab", "x":0, "y":1.75, "w":1.5},
102 {"label":"Q", "x":1.5, "y":1.75},
103 {"label":"W", "x":2.5, "y":1.75},
104 {"label":"E", "x":3.5, "y":1.75},
105 {"label":"R", "x":4.5, "y":1.75},
106 {"label":"T", "x":5.5, "y":1.75},
107 {"label":"Y", "x":6.5, "y":1.75},
108 {"label":"U", "x":7.5, "y":1.75},
109 {"label":"I", "x":8.5, "y":1.75},
110 {"label":"O", "x":9.5, "y":1.75},
111 {"label":"P", "x":10.5, "y":1.75},
112 {"label":"[{", "x":11.5, "y":1.75},
113 {"label":"]}", "x":12.5, "y":1.75},
114 {"label":"\\|", "x":13.5, "y":1.75, "w":1.5},
115 {"label":"Delete", "x":15.25, "y":1.75},
116
117 {"label":"Caps Lock", "x":0, "y":2.75, "w":1.75},
118 {"label":"A", "x":1.75, "y":2.75},
119 {"label":"S", "x":2.75, "y":2.75},
120 {"label":"D", "x":3.75, "y":2.75},
121 {"label":"F", "x":4.75, "y":2.75},
122 {"label":"G", "x":5.75, "y":2.75},
123 {"label":"H", "x":6.75, "y":2.75},
124 {"label":"J", "x":7.75, "y":2.75},
125 {"label":"K", "x":8.75, "y":2.75},
126 {"label":"L", "x":9.75, "y":2.75},
127 {"label":";:", "x":10.75, "y":2.75},
128 {"label":"'\"", "x":11.75, "y":2.75},
129 {"label":"Enter", "x":12.75, "y":2.75, "w":2.25},
130 {"label":"Home", "x":15.25, "y":2.75},
131
132 {"label":"Shift", "x":0, "y":3.75, "w":2.25},
133 {"label":"Z", "x":2.25, "y":3.75},
134 {"label":"X", "x":3.25, "y":3.75},
135 {"label":"C", "x":4.25, "y":3.75},
136 {"label":"V", "x":5.25, "y":3.75},
137 {"label":"B", "x":6.25, "y":3.75},
138 {"label":"N", "x":7.25, "y":3.75},
139 {"label":"M", "x":8.25, "y":3.75},
140 {"label":",<", "x":9.25, "y":3.75},
141 {"label":".>", "x":10.25, "y":3.75},
142 {"label":"/?", "x":11.25, "y":3.75},
143 {"label":"Shift", "x":12.25, "y":3.75, "w":1.75},
144 {"label":"Up", "x":14.25, "y":4},
145
146 {"label":"Ctrl", "x":0, "y":4.75, "w":1.25},
147 {"label":"Win", "x":1.25, "y":4.75, "w":1.25},
148 {"label":"Alt", "x":2.5, "y":4.75, "w":1.25},
149 {"label":"Space", "x":3.75, "y":4.75, "w":6.25},
150 {"label":"Alt", "x":10, "y":4.75},
151 {"label":"Fn1", "x":11, "y":4.75},
152 {"label":"Fn2", "x":12, "y":4.75},
153 {"label":"Left", "x":13.25, "y":5},
154 {"label":"Down", "x":14.25, "y":5},
155 {"label":"Right", "x":15.25, "y":5}
156 ]
157 }
158 }
159}
diff --git a/keyboards/keychron/q2/rev_0111/keymaps/default/info.json b/keyboards/keychron/q2/rev_0111/keymaps/default/info.json
deleted file mode 100644
index 590ed6d11..000000000
--- a/keyboards/keychron/q2/rev_0111/keymaps/default/info.json
+++ /dev/null
@@ -1,82 +0,0 @@
1{
2 "keyboard_name": "Keychron Q2",
3 "url": "https://github.com/Keychron",
4 "maintainer": "lalalademaxiya1",
5 "layouts": {
6 "LAYOUT_ansi_": {
7 "layout": [
8 {"label":"Mute", "x":15.25, "y":0},
9
10 {"label":"Esc", "x":0, "y":0.25},
11 {"label":"!", "x":1, "y":0.25},
12 {"label":"@", "x":2, "y":0.25},
13 {"label":"", "x":3, "y":0.25},
14 {"label":"$", "x":4, "y":0.25},
15 {"label":"%", "x":5, "y":0.25},
16 {"label":"^", "x":6, "y":0.25},
17 {"label":"&", "x":7, "y":0.25},
18 {"label":"*", "x":8, "y":0.25},
19 {"label":"(", "x":9, "y":0.25},
20 {"label":")", "x":10, "y":0.25},
21 {"label":"_", "x":11, "y":0.25},
22 {"label":"+", "x":12, "y":0.25},
23 {"label":"Backspace", "x":13, "y":0.25, "w":2},
24
25 {"label":"Tab", "x":0, "y":1.25, "w":1.5},
26 {"label":"Q", "x":1.5, "y":1.25},
27 {"label":"W", "x":2.5, "y":1.25},
28 {"label":"E", "x":3.5, "y":1.25},
29 {"label":"R", "x":4.5, "y":1.25},
30 {"label":"T", "x":5.5, "y":1.25},
31 {"label":"Y", "x":6.5, "y":1.25},
32 {"label":"U", "x":7.5, "y":1.25},
33 {"label":"I", "x":8.5, "y":1.25},
34 {"label":"O", "x":9.5, "y":1.25},
35 {"label":"P", "x":10.5, "y":1.25},
36 {"label":"{", "x":11.5, "y":1.25},
37 {"label":"}", "x":12.5, "y":1.25},
38 {"label":"|", "x":13.5, "y":1.25, "w":1.5},
39 {"label":"Delete", "x":15.25, "y":1.25},
40
41 {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
42 {"label":"A", "x":1.75, "y":2.25},
43 {"label":"S", "x":2.75, "y":2.25},
44 {"label":"D", "x":3.75, "y":2.25},
45 {"label":"F", "x":4.75, "y":2.25},
46 {"label":"G", "x":5.75, "y":2.25},
47 {"label":"H", "x":6.75, "y":2.25},
48 {"label":"J", "x":7.75, "y":2.25},
49 {"label":"K", "x":8.75, "y":2.25},
50 {"label":"L", "x":9.75, "y":2.25},
51 {"label":":", "x":10.75, "y":2.25},
52 {"label":"\"", "x":11.75, "y":2.25},
53 {"label":"Enter", "x":12.75, "y":2.25, "w":2.25},
54 {"label":"Home", "x":15.25, "y":2.25},
55
56 {"label":"Shift", "x":0, "y":3.25, "w":2.25},
57 {"label":"Z", "x":2.25, "y":3.25},
58 {"label":"X", "x":3.25, "y":3.25},
59 {"label":"C", "x":4.25, "y":3.25},
60 {"label":"V", "x":5.25, "y":3.25},
61 {"label":"B", "x":6.25, "y":3.25},
62 {"label":"N", "x":7.25, "y":3.25},
63 {"label":"M", "x":8.25, "y":3.25},
64 {"label":"<", "x":9.25, "y":3.25},
65 {"label":">", "x":10.25, "y":3.25},
66 {"label":"?", "x":11.25, "y":3.25},
67 {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
68 {"label":"Up", "x":14.25, "y":3.5},
69
70 {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
71 {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
72 {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
73 {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
74 {"label":"Alt", "x":10, "y":4.25},
75 {"label":"Fn1", "x":11, "y":4.25},
76 {"label":"Fn2", "x":12, "y":4.25},
77 {"label":"Left", "x":13.25, "y":4.5},
78 {"label":"Down", "x":14.25, "y":4.5},
79 {"label":"Right", "x":15.25, "y":4.5} ]
80 }
81 }
82}
diff --git a/keyboards/keychron/q2/rev_0111/keymaps/via/info.json b/keyboards/keychron/q2/rev_0111/keymaps/via/info.json
deleted file mode 100644
index 0e2ad8463..000000000
--- a/keyboards/keychron/q2/rev_0111/keymaps/via/info.json
+++ /dev/null
@@ -1,84 +0,0 @@
1{
2 "keyboard_name": "Keychron Q2",
3 "url": "https://github.com/Keychron",
4 "maintainer": "lalalademaxiya1",
5 "layouts": {
6 "LAYOUT_ansi_": {
7 "layout": [
8 {"label":"Mute", "x":15.25, "y":0, "w":0.75},
9 {"label":"Vol-", "x":16, "y":0, "w":0.75, "h":0.5},
10 {"label":"Vol+", "x":16, "y":0.5, "w":0.75, "h":0.5},
11
12 {"label":"Esc", "x":0, "y":0.25},
13 {"label":"!", "x":1, "y":0.25},
14 {"label":"@", "x":2, "y":0.25},
15 {"label":"", "x":3, "y":0.25},
16 {"label":"$", "x":4, "y":0.25},
17 {"label":"%", "x":5, "y":0.25},
18 {"label":"^", "x":6, "y":0.25},
19 {"label":"&", "x":7, "y":0.25},
20 {"label":"*", "x":8, "y":0.25},
21 {"label":"(", "x":9, "y":0.25},
22 {"label":")", "x":10, "y":0.25},
23 {"label":"_", "x":11, "y":0.25},
24 {"label":"+", "x":12, "y":0.25},
25 {"label":"Backspace", "x":13, "y":0.25, "w":2},
26
27 {"label":"Tab", "x":0, "y":1.25, "w":1.5},
28 {"label":"Q", "x":1.5, "y":1.25},
29 {"label":"W", "x":2.5, "y":1.25},
30 {"label":"E", "x":3.5, "y":1.25},
31 {"label":"R", "x":4.5, "y":1.25},
32 {"label":"T", "x":5.5, "y":1.25},
33 {"label":"Y", "x":6.5, "y":1.25},
34 {"label":"U", "x":7.5, "y":1.25},
35 {"label":"I", "x":8.5, "y":1.25},
36 {"label":"O", "x":9.5, "y":1.25},
37 {"label":"P", "x":10.5, "y":1.25},
38 {"label":"{", "x":11.5, "y":1.25},
39 {"label":"}", "x":12.5, "y":1.25},
40 {"label":"|", "x":13.5, "y":1.25, "w":1.5},
41 {"label":"Delete", "x":15.25, "y":1.25},
42
43 {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
44 {"label":"A", "x":1.75, "y":2.25},
45 {"label":"S", "x":2.75, "y":2.25},
46 {"label":"D", "x":3.75, "y":2.25},
47 {"label":"F", "x":4.75, "y":2.25},
48 {"label":"G", "x":5.75, "y":2.25},
49 {"label":"H", "x":6.75, "y":2.25},
50 {"label":"J", "x":7.75, "y":2.25},
51 {"label":"K", "x":8.75, "y":2.25},
52 {"label":"L", "x":9.75, "y":2.25},
53 {"label":":", "x":10.75, "y":2.25},
54 {"label":"\"", "x":11.75, "y":2.25},
55 {"label":"Enter", "x":12.75, "y":2.25, "w":2.25},
56 {"label":"Home", "x":15.25, "y":2.25},
57
58 {"label":"Shift", "x":0, "y":3.25, "w":2.25},
59 {"label":"Z", "x":2.25, "y":3.25},
60 {"label":"X", "x":3.25, "y":3.25},
61 {"label":"C", "x":4.25, "y":3.25},
62 {"label":"V", "x":5.25, "y":3.25},
63 {"label":"B", "x":6.25, "y":3.25},
64 {"label":"N", "x":7.25, "y":3.25},
65 {"label":"M", "x":8.25, "y":3.25},
66 {"label":"<", "x":9.25, "y":3.25},
67 {"label":">", "x":10.25, "y":3.25},
68 {"label":"?", "x":11.25, "y":3.25},
69 {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
70 {"label":"Up", "x":14.25, "y":3.5},
71
72 {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
73 {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
74 {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
75 {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
76 {"label":"Alt", "x":10, "y":4.25},
77 {"label":"Fn1", "x":11, "y":4.25},
78 {"label":"Fn2", "x":12, "y":4.25},
79 {"label":"Left", "x":13.25, "y":4.5},
80 {"label":"Down", "x":14.25, "y":4.5},
81 {"label":"Right", "x":15.25, "y":4.5} ]
82 }
83 }
84}
diff --git a/keyboards/keychron/q2/rev_0111/keymaps/via/keymap.c b/keyboards/keychron/q2/rev_0111/keymaps/via/keymap.c
index 15cdbb027..a22143eb0 100644
--- a/keyboards/keychron/q2/rev_0111/keymaps/via/keymap.c
+++ b/keyboards/keychron/q2/rev_0111/keymaps/via/keymap.c
@@ -37,39 +37,39 @@ enum custom_keycodes {
37 37
38const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 38const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
39 [MAC_BASE] = LAYOUT_all( 39 [MAC_BASE] = LAYOUT_all(
40 KC_ESC, 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, KC_MUTE, 40 KC_ESC, 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, KC_VOLD, KC_MUTE, KC_VOLU,
41 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_BSLS, KC_DEL, 41 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_BSLS, KC_DEL,
42 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, KC_HOME, 42 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, KC_HOME,
43 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, 43 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
44 KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_VOLD, KC_VOLU, KC_RCMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT), 44 KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
45 45
46 [WIN_BASE] = LAYOUT_all( 46 [WIN_BASE] = LAYOUT_all(
47 KC_ESC, 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, KC_MUTE, 47 KC_ESC, 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, KC_VOLD, KC_MUTE, KC_VOLU,
48 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_BSLS, KC_DEL, 48 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_BSLS, KC_DEL,
49 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, KC_HOME, 49 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, KC_HOME,
50 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, 50 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
51 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_VOLD, KC_VOLU, KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT), 51 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
52 52
53 [_FN1] = LAYOUT_all( 53 [_FN1] = LAYOUT_all(
54 KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, 54 KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
55 RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 55 RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
56 KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 56 KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
57 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, 57 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,
58 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 58 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
59 59
60 [_FN2] = LAYOUT_all( 60 [_FN2] = LAYOUT_all(
61 KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, 61 KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
62 RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 62 RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
63 KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 63 KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
64 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, 64 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,
65 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 65 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
66 66
67 [_FN3] = LAYOUT_all( 67 [_FN3] = LAYOUT_all(
68 KC_WAVE, 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, KC_TRNS, 68 KC_WAVE, 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, KC_TRNS, KC_TRNS, KC_TRNS,
69 RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 69 RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
70 KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 70 KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
71 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, 71 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,
72 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) 72 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
73}; 73};
74 74
75#if defined(VIA_ENABLE) && defined(ENCODER_ENABLE) 75#if defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
diff --git a/keyboards/keychron/q2/rev_0111/rev_0111.h b/keyboards/keychron/q2/rev_0111/rev_0111.h
index 0b1cfade1..5033db61f 100644
--- a/keyboards/keychron/q2/rev_0111/rev_0111.h
+++ b/keyboards/keychron/q2/rev_0111/rev_0111.h
@@ -21,11 +21,11 @@
21#define XXX KC_NO 21#define XXX KC_NO
22 22
23#define LAYOUT_all( \ 23#define LAYOUT_all( \
24 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,\ 24 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K47, K0E, K48, \
25 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,\ 25 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,\
26 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E,\ 26 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E,\
27 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \ 27 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
28 K40, K41, K42, K46, K47, K48, K4A, K4B, K4C, K4D, K2C, K4E \ 28 K40, K41, K42, K46, K4A, K4B, K4C, K4D, K2C, K4E \
29) { \ 29) { \
30 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, }, \ 30 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, }, \
31 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, }, \ 31 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, }, \
diff --git a/keyboards/keychron/q2/rev_0112/info.json b/keyboards/keychron/q2/rev_0112/info.json
index 83a7addfe..5f0d4ab24 100644
--- a/keyboards/keychron/q2/rev_0112/info.json
+++ b/keyboards/keychron/q2/rev_0112/info.json
@@ -5,79 +5,79 @@
5 "layouts": { 5 "layouts": {
6 "LAYOUT_iso_68": { 6 "LAYOUT_iso_68": {
7 "layout": [ 7 "layout": [
8 {"label":"Insert", "x":15.25, "y":0}, 8 {"label":"Esc", "x":0, "y":0.25},
9 {"label":"1!", "x":1, "y":0.25},
10 {"label":"2\"", "x":2, "y":0.25},
11 {"label":"3\u00a3", "x":3, "y":0.25},
12 {"label":"4$", "x":4, "y":0.25},
13 {"label":"5%", "x":5, "y":0.25},
14 {"label":"6^", "x":6, "y":0.25},
15 {"label":"7&", "x":7, "y":0.25},
16 {"label":"8*", "x":8, "y":0.25},
17 {"label":"9(", "x":9, "y":0.25},
18 {"label":"0)", "x":10, "y":0.25},
19 {"label":"-_", "x":11, "y":0.25},
20 {"label":"=+", "x":12, "y":0.25},
21 {"label":"Backspace", "x":13, "y":0.25, "w":2},
22 {"label":"Insert", "x":15.25, "y":0},
9 23
10 {"label":"Esc", "x":0, "y":0.25}, 24 {"label":"Tab", "x":0, "y":1.25, "w":1.5},
11 {"label":"!", "x":1, "y":0.25}, 25 {"label":"Q", "x":1.5, "y":1.25},
12 {"label":"@", "x":2, "y":0.25}, 26 {"label":"W", "x":2.5, "y":1.25},
13 {"label":"", "x":3, "y":0.25}, 27 {"label":"E", "x":3.5, "y":1.25},
14 {"label":"$", "x":4, "y":0.25}, 28 {"label":"R", "x":4.5, "y":1.25},
15 {"label":"%", "x":5, "y":0.25}, 29 {"label":"T", "x":5.5, "y":1.25},
16 {"label":"^", "x":6, "y":0.25}, 30 {"label":"Y", "x":6.5, "y":1.25},
17 {"label":"&", "x":7, "y":0.25}, 31 {"label":"U", "x":7.5, "y":1.25},
18 {"label":"*", "x":8, "y":0.25}, 32 {"label":"I", "x":8.5, "y":1.25},
19 {"label":"(", "x":9, "y":0.25}, 33 {"label":"O", "x":9.5, "y":1.25},
20 {"label":")", "x":10, "y":0.25}, 34 {"label":"P", "x":10.5, "y":1.25},
21 {"label":"_", "x":11, "y":0.25}, 35 {"label":"[{", "x":11.5, "y":1.25},
22 {"label":"+", "x":12, "y":0.25}, 36 {"label":"]}", "x":12.5, "y":1.25},
23 {"label":"Backspace", "x":13, "y":0.25, "w":2}, 37 {"label":"Delete", "x":15.25, "y":1.25},
24 38
25 {"label":"Tab", "x":0, "y":1.25, "w":1.5}, 39 {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
26 {"label":"Q", "x":1.5, "y":1.25}, 40 {"label":"A", "x":1.75, "y":2.25},
27 {"label":"W", "x":2.5, "y":1.25}, 41 {"label":"S", "x":2.75, "y":2.25},
28 {"label":"E", "x":3.5, "y":1.25}, 42 {"label":"D", "x":3.75, "y":2.25},
29 {"label":"R", "x":4.5, "y":1.25}, 43 {"label":"F", "x":4.75, "y":2.25},
30 {"label":"T", "x":5.5, "y":1.25}, 44 {"label":"G", "x":5.75, "y":2.25},
31 {"label":"Y", "x":6.5, "y":1.25}, 45 {"label":"H", "x":6.75, "y":2.25},
32 {"label":"U", "x":7.5, "y":1.25}, 46 {"label":"J", "x":7.75, "y":2.25},
33 {"label":"I", "x":8.5, "y":1.25}, 47 {"label":"K", "x":8.75, "y":2.25},
34 {"label":"O", "x":9.5, "y":1.25}, 48 {"label":"L", "x":9.75, "y":2.25},
35 {"label":"P", "x":10.5, "y":1.25}, 49 {"label":";:", "x":10.75, "y":2.25},
36 {"label":"{", "x":11.5, "y":1.25}, 50 {"label":"'@", "x":11.75, "y":2.25},
37 {"label":"}", "x":12.5, "y":1.25}, 51 {"label":"#~", "x":12.75, "y":2.25},
38 {"label":"Delete", "x":15.25, "y":1.25}, 52 {"label":"Enter", "x":13.75, "y":1.25, "w":1.25, "h":2},
53 {"label":"Home", "x":15.25, "y":2.25},
39 54
40 {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75}, 55 {"label":"Shift", "x":0, "y":3.25, "w":1.25},
41 {"label":"A", "x":1.75, "y":2.25}, 56 {"label":"\\|", "x":1.25, "y":3.25},
42 {"label":"S", "x":2.75, "y":2.25}, 57 {"label":"Z", "x":2.25, "y":3.25},
43 {"label":"D", "x":3.75, "y":2.25}, 58 {"label":"X", "x":3.25, "y":3.25},
44 {"label":"F", "x":4.75, "y":2.25}, 59 {"label":"C", "x":4.25, "y":3.25},
45 {"label":"G", "x":5.75, "y":2.25}, 60 {"label":"V", "x":5.25, "y":3.25},
46 {"label":"H", "x":6.75, "y":2.25}, 61 {"label":"B", "x":6.25, "y":3.25},
47 {"label":"J", "x":7.75, "y":2.25}, 62 {"label":"N", "x":7.25, "y":3.25},
48 {"label":"K", "x":8.75, "y":2.25}, 63 {"label":"M", "x":8.25, "y":3.25},
49 {"label":"L", "x":9.75, "y":2.25}, 64 {"label":",<", "x":9.25, "y":3.25},
50 {"label":":", "x":10.75, "y":2.25}, 65 {"label":".>", "x":10.25, "y":3.25},
51 {"label":"\"", "x":11.75, "y":2.25}, 66 {"label":"/?", "x":11.25, "y":3.25},
52 {"label":"#~", "x":12.75, "y":2.25}, 67 {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
53 {"label":"Enter", "x":13.75, "y":2.25, "w":1.25} 68 {"label":"Up", "x":14.25, "y":3.5},
54 {"label":"Home", "x":15.25, "y":2.25},
55 69
56 {"label":"Shift", "x":0, "y":3.25, "w":1.25}, 70 {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
57 {"label":"|", "x":1.25, "y":3.25}, 71 {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
58 {"label":"Z", "x":2.25, "y":3.25}, 72 {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
59 {"label":"X", "x":3.25, "y":3.25}, 73 {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
60 {"label":"C", "x":4.25, "y":3.25}, 74 {"label":"Alt", "x":10, "y":4.25},
61 {"label":"V", "x":5.25, "y":3.25}, 75 {"label":"Fn1", "x":11, "y":4.25},
62 {"label":"B", "x":6.25, "y":3.25}, 76 {"label":"Fn2", "x":12, "y":4.25},
63 {"label":"N", "x":7.25, "y":3.25}, 77 {"label":"Left", "x":13.25, "y":4.5},
64 {"label":"M", "x":8.25, "y":3.25}, 78 {"label":"Down", "x":14.25, "y":4.5},
65 {"label":"<", "x":9.25, "y":3.25}, 79 {"label":"Right", "x":15.25, "y":4.5}
66 {"label":">", "x":10.25, "y":3.25}, 80 ]
67 {"label":"?", "x":11.25, "y":3.25},
68 {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
69 {"label":"Up", "x":14.25, "y":3.5},
70
71 {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
72 {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
73 {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
74 {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
75 {"label":"Alt", "x":10, "y":4.25},
76 {"label":"Fn1", "x":11, "y":4.25},
77 {"label":"Fn2", "x":12, "y":4.25},
78 {"label":"Left", "x":13.25, "y":4.5},
79 {"label":"Down", "x":14.25, "y":4.5},
80 {"label":"Right", "x":15.25, "y":4.5} ]
81 } 81 }
82 } 82 }
83} 83}
diff --git a/keyboards/keychron/q2/rev_0113/info.json b/keyboards/keychron/q2/rev_0113/info.json
new file mode 100644
index 000000000..151f42455
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0113/info.json
@@ -0,0 +1,161 @@
1{
2 "keyboard_name": "Keychron Q2",
3 "url": "https://github.com/Keychron",
4 "maintainer": "lalalademaxiya1",
5 "layouts": {
6 "LAYOUT_iso_68": {
7 "layout": [
8 {"label":"Esc", "x":0, "y":0.25},
9 {"label":"1!", "x":1, "y":0.25},
10 {"label":"2\"", "x":2, "y":0.25},
11 {"label":"3\u00a3", "x":3, "y":0.25},
12 {"label":"4$", "x":4, "y":0.25},
13 {"label":"5%", "x":5, "y":0.25},
14 {"label":"6^", "x":6, "y":0.25},
15 {"label":"7&", "x":7, "y":0.25},
16 {"label":"8*", "x":8, "y":0.25},
17 {"label":"9(", "x":9, "y":0.25},
18 {"label":"0)", "x":10, "y":0.25},
19 {"label":"-_", "x":11, "y":0.25},
20 {"label":"=+", "x":12, "y":0.25},
21 {"label":"Backspace", "x":13, "y":0.25, "w":2},
22 {"label":"Mute", "x":15.25, "y":0},
23
24 {"label":"Tab", "x":0, "y":1.25, "w":1.5},
25 {"label":"Q", "x":1.5, "y":1.25},
26 {"label":"W", "x":2.5, "y":1.25},
27 {"label":"E", "x":3.5, "y":1.25},
28 {"label":"R", "x":4.5, "y":1.25},
29 {"label":"T", "x":5.5, "y":1.25},
30 {"label":"Y", "x":6.5, "y":1.25},
31 {"label":"U", "x":7.5, "y":1.25},
32 {"label":"I", "x":8.5, "y":1.25},
33 {"label":"O", "x":9.5, "y":1.25},
34 {"label":"P", "x":10.5, "y":1.25},
35 {"label":"[{", "x":11.5, "y":1.25},
36 {"label":"]}", "x":12.5, "y":1.25},
37 {"label":"Delete", "x":15.25, "y":1.25},
38
39 {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
40 {"label":"A", "x":1.75, "y":2.25},
41 {"label":"S", "x":2.75, "y":2.25},
42 {"label":"D", "x":3.75, "y":2.25},
43 {"label":"F", "x":4.75, "y":2.25},
44 {"label":"G", "x":5.75, "y":2.25},
45 {"label":"H", "x":6.75, "y":2.25},
46 {"label":"J", "x":7.75, "y":2.25},
47 {"label":"K", "x":8.75, "y":2.25},
48 {"label":"L", "x":9.75, "y":2.25},
49 {"label":";:", "x":10.75, "y":2.25},
50 {"label":"'@", "x":11.75, "y":2.25},
51 {"label":"#~", "x":12.75, "y":2.25},
52 {"label":"Enter", "x":13.75, "y":1.25, "w":1.25, "h":2},
53 {"label":"Home", "x":15.25, "y":2.25},
54
55 {"label":"Shift", "x":0, "y":3.25, "w":1.25},
56 {"label":"\\|", "x":1.25, "y":3.25},
57 {"label":"Z", "x":2.25, "y":3.25},
58 {"label":"X", "x":3.25, "y":3.25},
59 {"label":"C", "x":4.25, "y":3.25},
60 {"label":"V", "x":5.25, "y":3.25},
61 {"label":"B", "x":6.25, "y":3.25},
62 {"label":"N", "x":7.25, "y":3.25},
63 {"label":"M", "x":8.25, "y":3.25},
64 {"label":",<", "x":9.25, "y":3.25},
65 {"label":".>", "x":10.25, "y":3.25},
66 {"label":"/?", "x":11.25, "y":3.25},
67 {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
68 {"label":"Up", "x":14.25, "y":3.5},
69
70 {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
71 {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
72 {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
73 {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
74 {"label":"Alt", "x":10, "y":4.25},
75 {"label":"Fn1", "x":11, "y":4.25},
76 {"label":"Fn2", "x":12, "y":4.25},
77 {"label":"Left", "x":13.25, "y":4.5},
78 {"label":"Down", "x":14.25, "y":4.5},
79 {"label":"Right", "x":15.25, "y":4.5}
80 ]
81 },
82 "LAYOUT_all": {
83 "layout": [
84 {"label":"Esc", "x":0, "y":0.75},
85 {"label":"1!", "x":1, "y":0.75},
86 {"label":"2\"", "x":2, "y":0.75},
87 {"label":"3\u00a3", "x":3, "y":0.75},
88 {"label":"4$", "x":4, "y":0.75},
89 {"label":"5%", "x":5, "y":0.75},
90 {"label":"6^", "x":6, "y":0.75},
91 {"label":"7&", "x":7, "y":0.75},
92 {"label":"8*", "x":8, "y":0.75},
93 {"label":"9(", "x":9, "y":0.75},
94 {"label":"0)", "x":10, "y":0.75},
95 {"label":"-_", "x":11, "y":0.75},
96 {"label":"=+", "x":12, "y":0.75},
97 {"label":"Backspace", "x":13, "y":0.75, "w":2},
98 {"label":"CCW", "x":15.15, "y":0, "w":0.6, "h":0.5},
99 {"label":"Mute", "x":15.25, "y":0.5},
100 {"label":"CW", "x":15.75, "y":0, "w":0.6, "h":0.5},
101
102 {"label":"Tab", "x":0, "y":1.75, "w":1.5},
103 {"label":"Q", "x":1.5, "y":1.75},
104 {"label":"W", "x":2.5, "y":1.75},
105 {"label":"E", "x":3.5, "y":1.75},
106 {"label":"R", "x":4.5, "y":1.75},
107 {"label":"T", "x":5.5, "y":1.75},
108 {"label":"Y", "x":6.5, "y":1.75},
109 {"label":"U", "x":7.5, "y":1.75},
110 {"label":"I", "x":8.5, "y":1.75},
111 {"label":"O", "x":9.5, "y":1.75},
112 {"label":"P", "x":10.5, "y":1.75},
113 {"label":"[{", "x":11.5, "y":1.75},
114 {"label":"]}", "x":12.5, "y":1.75},
115 {"label":"Delete", "x":15.25, "y":1.75},
116
117 {"label":"Caps Lock", "x":0, "y":2.75, "w":1.75},
118 {"label":"A", "x":1.75, "y":2.75},
119 {"label":"S", "x":2.75, "y":2.75},
120 {"label":"D", "x":3.75, "y":2.75},
121 {"label":"F", "x":4.75, "y":2.75},
122 {"label":"G", "x":5.75, "y":2.75},
123 {"label":"H", "x":6.75, "y":2.75},
124 {"label":"J", "x":7.75, "y":2.75},
125 {"label":"K", "x":8.75, "y":2.75},
126 {"label":"L", "x":9.75, "y":2.75},
127 {"label":";:", "x":10.75, "y":2.75},
128 {"label":"'@", "x":11.75, "y":2.75},
129 {"label":"#~", "x":12.75, "y":2.75},
130 {"label":"Enter", "x":13.75, "y":1.75, "w":1.25, "h":2},
131 {"label":"Home", "x":15.25, "y":2.75},
132
133 {"label":"Shift", "x":0, "y":3.75, "w":1.25},
134 {"label":"\\|", "x":1.25, "y":3.75},
135 {"label":"Z", "x":2.25, "y":3.75},
136 {"label":"X", "x":3.25, "y":3.75},
137 {"label":"C", "x":4.25, "y":3.75},
138 {"label":"V", "x":5.25, "y":3.75},
139 {"label":"B", "x":6.25, "y":3.75},
140 {"label":"N", "x":7.25, "y":3.75},
141 {"label":"M", "x":8.25, "y":3.75},
142 {"label":",<", "x":9.25, "y":3.75},
143 {"label":".>", "x":10.25, "y":3.75},
144 {"label":"/?", "x":11.25, "y":3.75},
145 {"label":"Shift", "x":12.25, "y":3.75, "w":1.75},
146 {"label":"Up", "x":14.25, "y":4},
147
148 {"label":"Ctrl", "x":0, "y":4.75, "w":1.25},
149 {"label":"Win", "x":1.25, "y":4.75, "w":1.25},
150 {"label":"Alt", "x":2.5, "y":4.75, "w":1.25},
151 {"label":"Space", "x":3.75, "y":4.75, "w":6.25},
152 {"label":"Alt", "x":10, "y":4.75},
153 {"label":"Fn1", "x":11, "y":4.75},
154 {"label":"Fn2", "x":12, "y":4.75},
155 {"label":"Left", "x":13.25, "y":5},
156 {"label":"Down", "x":14.25, "y":5},
157 {"label":"Right", "x":15.25, "y":5}
158 ]
159 }
160 }
161}
diff --git a/keyboards/keychron/q2/rev_0113/keymaps/default/info.json b/keyboards/keychron/q2/rev_0113/keymaps/default/info.json
deleted file mode 100644
index 8448d4c99..000000000
--- a/keyboards/keychron/q2/rev_0113/keymaps/default/info.json
+++ /dev/null
@@ -1,83 +0,0 @@
1{
2 "keyboard_name": "Keychron Q2",
3 "url": "https://github.com/Keychron",
4 "maintainer": "lalalademaxiya1",
5 "layouts": {
6 "LAYOUT_iso_68": {
7 "layout": [
8 {"label":"Mute", "x":15.25, "y":0},
9
10 {"label":"Esc", "x":0, "y":0.25},
11 {"label":"!", "x":1, "y":0.25},
12 {"label":"@", "x":2, "y":0.25},
13 {"label":"", "x":3, "y":0.25},
14 {"label":"$", "x":4, "y":0.25},
15 {"label":"%", "x":5, "y":0.25},
16 {"label":"^", "x":6, "y":0.25},
17 {"label":"&", "x":7, "y":0.25},
18 {"label":"*", "x":8, "y":0.25},
19 {"label":"(", "x":9, "y":0.25},
20 {"label":")", "x":10, "y":0.25},
21 {"label":"_", "x":11, "y":0.25},
22 {"label":"+", "x":12, "y":0.25},
23 {"label":"Backspace", "x":13, "y":0.25, "w":2},
24
25 {"label":"Tab", "x":0, "y":1.25, "w":1.5},
26 {"label":"Q", "x":1.5, "y":1.25},
27 {"label":"W", "x":2.5, "y":1.25},
28 {"label":"E", "x":3.5, "y":1.25},
29 {"label":"R", "x":4.5, "y":1.25},
30 {"label":"T", "x":5.5, "y":1.25},
31 {"label":"Y", "x":6.5, "y":1.25},
32 {"label":"U", "x":7.5, "y":1.25},
33 {"label":"I", "x":8.5, "y":1.25},
34 {"label":"O", "x":9.5, "y":1.25},
35 {"label":"P", "x":10.5, "y":1.25},
36 {"label":"{", "x":11.5, "y":1.25},
37 {"label":"}", "x":12.5, "y":1.25},
38 {"label":"Delete", "x":15.25, "y":1.25},
39
40 {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
41 {"label":"A", "x":1.75, "y":2.25},
42 {"label":"S", "x":2.75, "y":2.25},
43 {"label":"D", "x":3.75, "y":2.25},
44 {"label":"F", "x":4.75, "y":2.25},
45 {"label":"G", "x":5.75, "y":2.25},
46 {"label":"H", "x":6.75, "y":2.25},
47 {"label":"J", "x":7.75, "y":2.25},
48 {"label":"K", "x":8.75, "y":2.25},
49 {"label":"L", "x":9.75, "y":2.25},
50 {"label":":", "x":10.75, "y":2.25},
51 {"label":"\"", "x":11.75, "y":2.25},
52 {"label":"#~", "x":12.75, "y":2.25},
53 {"label":"Enter", "x":13.75, "y":2.25, "w":1.25},
54 {"label":"Home", "x":15.25, "y":2.25},
55
56 {"label":"Shift", "x":0, "y":3.25, "w":1.25},
57 {"label":"|", "x":1.25, "y":3.25},
58 {"label":"Z", "x":2.25, "y":3.25},
59 {"label":"X", "x":3.25, "y":3.25},
60 {"label":"C", "x":4.25, "y":3.25},
61 {"label":"V", "x":5.25, "y":3.25},
62 {"label":"B", "x":6.25, "y":3.25},
63 {"label":"N", "x":7.25, "y":3.25},
64 {"label":"M", "x":8.25, "y":3.25},
65 {"label":"<", "x":9.25, "y":3.25},
66 {"label":">", "x":10.25, "y":3.25},
67 {"label":"?", "x":11.25, "y":3.25},
68 {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
69 {"label":"Up", "x":14.25, "y":3.5},
70
71 {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
72 {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
73 {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
74 {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
75 {"label":"Alt", "x":10, "y":4.25},
76 {"label":"Fn1", "x":11, "y":4.25},
77 {"label":"Fn2", "x":12, "y":4.25},
78 {"label":"Left", "x":13.25, "y":4.5},
79 {"label":"Down", "x":14.25, "y":4.5},
80 {"label":"Right", "x":15.25, "y":4.5} ]
81 }
82 }
83}
diff --git a/keyboards/keychron/q2/rev_0113/keymaps/via/info.json b/keyboards/keychron/q2/rev_0113/keymaps/via/info.json
deleted file mode 100644
index 6111f83d2..000000000
--- a/keyboards/keychron/q2/rev_0113/keymaps/via/info.json
+++ /dev/null
@@ -1,85 +0,0 @@
1{
2 "keyboard_name": "Keychron Q2",
3 "url": "https://github.com/Keychron",
4 "maintainer": "lalalademaxiya1",
5 "layouts": {
6 "LAYOUT_iso_68": {
7 "layout": [
8 {"label":"Mute", "x":15.25, "y":0, "w":0.75},
9 {"label":"Vol-", "x":16, "y":0, "w":0.75, "h":0.5},
10 {"label":"Vol+", "x":16, "y":0.5, "w":0.75, "h":0.5},
11
12 {"label":"Esc", "x":0, "y":0.25},
13 {"label":"!", "x":1, "y":0.25},
14 {"label":"@", "x":2, "y":0.25},
15 {"label":"", "x":3, "y":0.25},
16 {"label":"$", "x":4, "y":0.25},
17 {"label":"%", "x":5, "y":0.25},
18 {"label":"^", "x":6, "y":0.25},
19 {"label":"&", "x":7, "y":0.25},
20 {"label":"*", "x":8, "y":0.25},
21 {"label":"(", "x":9, "y":0.25},
22 {"label":")", "x":10, "y":0.25},
23 {"label":"_", "x":11, "y":0.25},
24 {"label":"+", "x":12, "y":0.25},
25 {"label":"Backspace", "x":13, "y":0.25, "w":2},
26
27 {"label":"Tab", "x":0, "y":1.25, "w":1.5},
28 {"label":"Q", "x":1.5, "y":1.25},
29 {"label":"W", "x":2.5, "y":1.25},
30 {"label":"E", "x":3.5, "y":1.25},
31 {"label":"R", "x":4.5, "y":1.25},
32 {"label":"T", "x":5.5, "y":1.25},
33 {"label":"Y", "x":6.5, "y":1.25},
34 {"label":"U", "x":7.5, "y":1.25},
35 {"label":"I", "x":8.5, "y":1.25},
36 {"label":"O", "x":9.5, "y":1.25},
37 {"label":"P", "x":10.5, "y":1.25},
38 {"label":"{", "x":11.5, "y":1.25},
39 {"label":"}", "x":12.5, "y":1.25},
40 {"label":"Delete", "x":15.25, "y":1.25},
41
42 {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
43 {"label":"A", "x":1.75, "y":2.25},
44 {"label":"S", "x":2.75, "y":2.25},
45 {"label":"D", "x":3.75, "y":2.25},
46 {"label":"F", "x":4.75, "y":2.25},
47 {"label":"G", "x":5.75, "y":2.25},
48 {"label":"H", "x":6.75, "y":2.25},
49 {"label":"J", "x":7.75, "y":2.25},
50 {"label":"K", "x":8.75, "y":2.25},
51 {"label":"L", "x":9.75, "y":2.25},
52 {"label":":", "x":10.75, "y":2.25},
53 {"label":"\"", "x":11.75, "y":2.25},
54 {"label":"#~", "x":12.75, "y":2.25},
55 {"label":"Enter", "x":13.75, "y":2.25, "w":1.25},
56 {"label":"Home", "x":15.25, "y":2.25},
57
58 {"label":"Shift", "x":0, "y":3.25, "w":1.25},
59 {"label":"|", "x":1.25, "y":3.25},
60 {"label":"Z", "x":2.25, "y":3.25},
61 {"label":"X", "x":3.25, "y":3.25},
62 {"label":"C", "x":4.25, "y":3.25},
63 {"label":"V", "x":5.25, "y":3.25},
64 {"label":"B", "x":6.25, "y":3.25},
65 {"label":"N", "x":7.25, "y":3.25},
66 {"label":"M", "x":8.25, "y":3.25},
67 {"label":"<", "x":9.25, "y":3.25},
68 {"label":">", "x":10.25, "y":3.25},
69 {"label":"?", "x":11.25, "y":3.25},
70 {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
71 {"label":"Up", "x":14.25, "y":3.5},
72
73 {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
74 {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
75 {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
76 {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
77 {"label":"Alt", "x":10, "y":4.25},
78 {"label":"Fn1", "x":11, "y":4.25},
79 {"label":"Fn2", "x":12, "y":4.25},
80 {"label":"Left", "x":13.25, "y":4.5},
81 {"label":"Down", "x":14.25, "y":4.5},
82 {"label":"Right", "x":15.25, "y":4.5} ]
83 }
84 }
85}
diff --git a/keyboards/keychron/q2/rev_0113/keymaps/via/keymap.c b/keyboards/keychron/q2/rev_0113/keymaps/via/keymap.c
index 9c7ad72be..4e3b431bd 100644
--- a/keyboards/keychron/q2/rev_0113/keymaps/via/keymap.c
+++ b/keyboards/keychron/q2/rev_0113/keymaps/via/keymap.c
@@ -37,39 +37,39 @@ enum custom_keycodes {
37 37
38const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 38const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
39 [MAC_BASE] = LAYOUT_all( 39 [MAC_BASE] = LAYOUT_all(
40 KC_ESC, KC_1, KC_2, KC_F3, KC_F4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_MUTE, 40 KC_ESC, KC_1, KC_2, KC_F3, KC_F4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_VOLD, KC_MUTE, KC_VOLU,
41 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_DEL, 41 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_DEL,
42 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_NUHS, KC_ENT, KC_HOME, 42 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_NUHS, KC_ENT, KC_HOME,
43 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, 43 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
44 KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_VOLD, KC_VOLU, KC_RCMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT), 44 KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
45 45
46 [WIN_BASE] = LAYOUT_all( 46 [WIN_BASE] = LAYOUT_all(
47 KC_ESC, 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, KC_MUTE, 47 KC_ESC, 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, KC_VOLD, KC_MUTE, KC_VOLU,
48 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_DEL, 48 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_DEL,
49 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_NUHS, KC_ENT, KC_HOME, 49 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_NUHS, KC_ENT, KC_HOME,
50 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, 50 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
51 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_VOLD, KC_VOLU, KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT), 51 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
52 52
53 [_FN1] = LAYOUT_all( 53 [_FN1] = LAYOUT_all(
54 KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, 54 KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
55 RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 55 RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
56 KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 56 KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
57 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, KC_TRNS, 57 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, KC_TRNS,
58 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 58 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
59 59
60 [_FN2] = LAYOUT_all( 60 [_FN2] = LAYOUT_all(
61 KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, 61 KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
62 RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 62 RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
63 KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 63 KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
64 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, KC_TRNS, 64 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, KC_TRNS,
65 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 65 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
66 66
67 [_FN3] = LAYOUT_all( 67 [_FN3] = LAYOUT_all(
68 KC_WAVE, 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, KC_TRNS, 68 KC_WAVE, 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, KC_TRNS, KC_TRNS, KC_TRNS,
69 RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 69 RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
70 KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 70 KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
71 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, KC_TRNS, 71 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, KC_TRNS,
72 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) 72 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
73}; 73};
74 74
75#if defined(VIA_ENABLE) && defined(ENCODER_ENABLE) 75#if defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
diff --git a/keyboards/keychron/q2/rev_0113/rev_0113.h b/keyboards/keychron/q2/rev_0113/rev_0113.h
index 21d20463e..3b0b2d337 100644
--- a/keyboards/keychron/q2/rev_0113/rev_0113.h
+++ b/keyboards/keychron/q2/rev_0113/rev_0113.h
@@ -21,11 +21,11 @@
21#define XXX KC_NO 21#define XXX KC_NO
22 22
23#define LAYOUT_all( \ 23#define LAYOUT_all( \
24 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,\ 24 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K47, K0E, K48,\
25 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E,\ 25 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E,\
26 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E,\ 26 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E,\
27 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \ 27 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
28 K40, K41, K42, K46, K47, K48, K4A, K4B, K4C, K4D, K2C, K4E \ 28 K40, K41, K42, K46, K4A, K4B, K4C, K4D, K2C, K4E \
29) { \ 29) { \
30 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, }, \ 30 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, }, \
31 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, }, \ 31 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, }, \
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-19 03:15:03 +0000