summaryrefslogtreecommitdiff
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)
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 0000000000..75fb2d04e8
--- /dev/null
+++ b/keyboards/keychron/q1/rev_0101/info.json
@@ -0,0 +1,191 @@
+{
+ "keyboard_name": "Keychron Q1",
+ "url": "https://github.com/Keychron",
+ "maintainer": "lalalademaxiya1",
+ "layouts": {
+ "LAYOUT_ansi_82": {
+ "layout": [
+ {"label":"Esc", "x":0, "y":0},
+ {"label":"F1", "x":1.25, "y":0},
+ {"label":"F2", "x":2.25, "y":0},
+ {"label":"F3", "x":3.25, "y":0},
+ {"label":"F4", "x":4.25, "y":0},
+ {"label":"F5", "x":5.5, "y":0},
+ {"label":"F6", "x":6.5, "y":0},
+ {"label":"F7", "x":7.5, "y":0},
+ {"label":"F8", "x":8.5, "y":0},
+ {"label":"F9", "x":9.75, "y":0},
+ {"label":"F10", "x":10.75, "y":0},
+ {"label":"F11", "x":11.75, "y":0},
+ {"label":"F12", "x":12.75, "y":0},
+ {"label":"Delete", "x":14, "y":0},
+ {"label":"Mute", "x":15.25, "y":0},
+
+ {"label":"`~", "x":0, "y":1.25},
+ {"label":"1!", "x":1, "y":1.25},
+ {"label":"2@", "x":2, "y":1.25},
+ {"label":"3#", "x":3, "y":1.25},
+ {"label":"4$", "x":4, "y":1.25},
+ {"label":"5%", "x":5, "y":1.25},
+ {"label":"6^", "x":6, "y":1.25},
+ {"label":"7&", "x":7, "y":1.25},
+ {"label":"8*", "x":8, "y":1.25},
+ {"label":"9(", "x":9, "y":1.25},
+ {"label":"0)", "x":10, "y":1.25},
+ {"label":"-_", "x":11, "y":1.25},
+ {"label":"=+", "x":12, "y":1.25},
+ {"label":"Backspace", "x":13, "y":1.25, "w":2},
+ {"label":"Page Up", "x":15.25, "y":1.25},
+
+ {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+ {"label":"Q", "x":1.5, "y":2.25},
+ {"label":"W", "x":2.5, "y":2.25},
+ {"label":"E", "x":3.5, "y":2.25},
+ {"label":"R", "x":4.5, "y":2.25},
+ {"label":"T", "x":5.5, "y":2.25},
+ {"label":"Y", "x":6.5, "y":2.25},
+ {"label":"U", "x":7.5, "y":2.25},
+ {"label":"I", "x":8.5, "y":2.25},
+ {"label":"O", "x":9.5, "y":2.25},
+ {"label":"P", "x":10.5, "y":2.25},
+ {"label":"[{", "x":11.5, "y":2.25},
+ {"label":"]}", "x":12.5, "y":2.25},
+ {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+ {"label":"Page Down", "x":15.25, "y":2.25},
+
+ {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+ {"label":"A", "x":1.75, "y":3.25},
+ {"label":"S", "x":2.75, "y":3.25},
+ {"label":"D", "x":3.75, "y":3.25},
+ {"label":"F", "x":4.75, "y":3.25},
+ {"label":"G", "x":5.75, "y":3.25},
+ {"label":"H", "x":6.75, "y":3.25},
+ {"label":"J", "x":7.75, "y":3.25},
+ {"label":"K", "x":8.75, "y":3.25},
+ {"label":"L", "x":9.75, "y":3.25},
+ {"label":";:", "x":10.75, "y":3.25},
+ {"label":"'\"", "x":11.75, "y":3.25},
+ {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+ {"label":"Home", "x":15.25, "y":3.25},
+
+ {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+ {"label":"Z", "x":2.25, "y":4.25},
+ {"label":"X", "x":3.25, "y":4.25},
+ {"label":"C", "x":4.25, "y":4.25},
+ {"label":"V", "x":5.25, "y":4.25},
+ {"label":"B", "x":6.25, "y":4.25},
+ {"label":"N", "x":7.25, "y":4.25},
+ {"label":"M", "x":8.25, "y":4.25},
+ {"label":",<", "x":9.25, "y":4.25},
+ {"label":".>", "x":10.25, "y":4.25},
+ {"label":"/?", "x":11.25, "y":4.25},
+ {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+ {"label":"Up", "x":14.25, "y":4.5},
+
+ {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+ {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+ {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+ {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+ {"label":"Alt", "x":10, "y":5.25},
+ {"label":"Fn", "x":11, "y":5.25},
+ {"label":"Ctrl", "x":12, "y":5.25},
+ {"label":"Left", "x":13.25, "y":5.5},
+ {"label":"Down", "x":14.25, "y":5.5},
+ {"label":"Right", "x":15.25, "y":5.5}
+ ]
+ },
+ "LAYOUT_all": {
+ "layout": [
+ {"label":"Esc", "x":0, "y":0.5},
+ {"label":"F1", "x":1.25, "y":0.5},
+ {"label":"F2", "x":2.25, "y":0.5},
+ {"label":"F3", "x":3.25, "y":0.5},
+ {"label":"F4", "x":4.25, "y":0.5},
+ {"label":"F5", "x":5.5, "y":0.5},
+ {"label":"F6", "x":6.5, "y":0.5},
+ {"label":"F7", "x":7.5, "y":0.5},
+ {"label":"F8", "x":8.5, "y":0.5},
+ {"label":"F9", "x":9.75, "y":0.5},
+ {"label":"F10", "x":10.75, "y":0.5},
+ {"label":"F11", "x":11.75, "y":0.5},
+ {"label":"F12", "x":12.75, "y":0.5},
+ {"label":"Delete", "x":14, "y":0.5},
+ {"label":"CCW", "x":15.15, "y":0, "w":0.6, "h":0.5},
+ {"label":"Mute", "x":15.25, "y":0.5},
+ {"label":"CW", "x":15.75, "y":0, "w":0.6, "h":0.5},
+
+ {"label":"`~", "x":0, "y":1.75},
+ {"label":"1!", "x":1, "y":1.75},
+ {"label":"2@", "x":2, "y":1.75},
+ {"label":"3#", "x":3, "y":1.75},
+ {"label":"4$", "x":4, "y":1.75},
+ {"label":"5%", "x":5, "y":1.75},
+ {"label":"6^", "x":6, "y":1.75},
+ {"label":"7&", "x":7, "y":1.75},
+ {"label":"8*", "x":8, "y":1.75},
+ {"label":"9(", "x":9, "y":1.75},
+ {"label":"0)", "x":10, "y":1.75},
+ {"label":"-_", "x":11, "y":1.75},
+ {"label":"=+", "x":12, "y":1.75},
+ {"label":"Backspace", "x":13, "y":1.75, "w":2},
+ {"label":"Page Up", "x":15.25, "y":1.75},
+
+ {"label":"Tab", "x":0, "y":2.75, "w":1.5},
+ {"label":"Q", "x":1.5, "y":2.75},
+ {"label":"W", "x":2.5, "y":2.75},
+ {"label":"E", "x":3.5, "y":2.75},
+ {"label":"R", "x":4.5, "y":2.75},
+ {"label":"T", "x":5.5, "y":2.75},
+ {"label":"Y", "x":6.5, "y":2.75},
+ {"label":"U", "x":7.5, "y":2.75},
+ {"label":"I", "x":8.5, "y":2.75},
+ {"label":"O", "x":9.5, "y":2.75},
+ {"label":"P", "x":10.5, "y":2.75},
+ {"label":"[{", "x":11.5, "y":2.75},
+ {"label":"]}", "x":12.5, "y":2.75},
+ {"label":"\\|", "x":13.5, "y":2.75, "w":1.5},
+ {"label":"Page Down", "x":15.25, "y":2.75},
+
+ {"label":"Caps Lock", "x":0, "y":3.75, "w":1.75},
+ {"label":"A", "x":1.75, "y":3.75},
+ {"label":"S", "x":2.75, "y":3.75},
+ {"label":"D", "x":3.75, "y":3.75},
+ {"label":"F", "x":4.75, "y":3.75},
+ {"label":"G", "x":5.75, "y":3.75},
+ {"label":"H", "x":6.75, "y":3.75},
+ {"label":"J", "x":7.75, "y":3.75},
+ {"label":"K", "x":8.75, "y":3.75},
+ {"label":"L", "x":9.75, "y":3.75},
+ {"label":";:", "x":10.75, "y":3.75},
+ {"label":"'\"", "x":11.75, "y":3.75},
+ {"label":"Enter", "x":12.75, "y":3.75, "w":2.25},
+ {"label":"Home", "x":15.25, "y":3.75},
+
+ {"label":"Shift", "x":0, "y":4.75, "w":2.25},
+ {"label":"Z", "x":2.25, "y":4.75},
+ {"label":"X", "x":3.25, "y":4.75},
+ {"label":"C", "x":4.25, "y":4.75},
+ {"label":"V", "x":5.25, "y":4.75},
+ {"label":"B", "x":6.25, "y":4.75},
+ {"label":"N", "x":7.25, "y":4.75},
+ {"label":"M", "x":8.25, "y":4.75},
+ {"label":",<", "x":9.25, "y":4.75},
+ {"label":".>", "x":10.25, "y":4.75},
+ {"label":"/?", "x":11.25, "y":4.75},
+ {"label":"Shift", "x":12.25, "y":4.75, "w":1.75},
+ {"label":"Up", "x":14.25, "y":5},
+
+ {"label":"Ctrl", "x":0, "y":5.75, "w":1.25},
+ {"label":"Win", "x":1.25, "y":5.75, "w":1.25},
+ {"label":"Alt", "x":2.5, "y":5.75, "w":1.25},
+ {"label":"Space", "x":3.75, "y":5.75, "w":6.25},
+ {"label":"Alt", "x":10, "y":5.75},
+ {"label":"Fn", "x":11, "y":5.75},
+ {"label":"Ctrl", "x":12, "y":5.75},
+ {"label":"Left", "x":13.25, "y":6},
+ {"label":"Down", "x":14.25, "y":6},
+ {"label":"Right", "x":15.25, "y":6}
+ ]
+ }
+ }
+}
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 56bf48acc1..0000000000
--- a/keyboards/keychron/q1/rev_0101/keymaps/default/info.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
- "keyboard_name": "Keychron Q1",
- "url": "https://github.com/Keychron",
- "maintainer": "lalalademaxiya1",
- "layouts": {
- "LAYOUT_ansi_82": {
- "layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"F1", "x":1.25, "y":0},
- {"label":"F2", "x":2.25, "y":0},
- {"label":"F3", "x":3.25, "y":0},
- {"label":"F4", "x":4.25, "y":0},
- {"label":"F5", "x":5.5, "y":0},
- {"label":"F6", "x":6.5, "y":0},
- {"label":"F7", "x":7.5, "y":0},
- {"label":"F8", "x":8.5, "y":0},
- {"label":"F9", "x":9.75, "y":0},
- {"label":"F10", "x":10.75, "y":0},
- {"label":"F11", "x":11.75, "y":0},
- {"label":"F12", "x":12.75, "y":0},
- {"label":"Delete", "x":14, "y":0},
- {"label":"Mute", "x":15.25, "y":0},
-
- {"label":"~", "x":0, "y":1.25},
- {"label":"!", "x":1, "y":1.25},
- {"label":"@", "x":2, "y":1.25},
- {"label":"#", "x":3, "y":1.25},
- {"label":"$", "x":4, "y":1.25},
- {"label":"%", "x":5, "y":1.25},
- {"label":"^", "x":6, "y":1.25},
- {"label":"&", "x":7, "y":1.25},
- {"label":"*", "x":8, "y":1.25},
- {"label":"(", "x":9, "y":1.25},
- {"label":")", "x":10, "y":1.25},
- {"label":"_", "x":11, "y":1.25},
- {"label":"+", "x":12, "y":1.25},
- {"label":"Backspace", "x":13, "y":1.25, "w":2},
- {"label":"Page Up", "x":15.25, "y":1.25},
-
- {"label":"Tab", "x":0, "y":2.25, "w":1.5},
- {"label":"Q", "x":1.5, "y":2.25},
- {"label":"W", "x":2.5, "y":2.25},
- {"label":"E", "x":3.5, "y":2.25},
- {"label":"R", "x":4.5, "y":2.25},
- {"label":"T", "x":5.5, "y":2.25},
- {"label":"Y", "x":6.5, "y":2.25},
- {"label":"U", "x":7.5, "y":2.25},
- {"label":"I", "x":8.5, "y":2.25},
- {"label":"O", "x":9.5, "y":2.25},
- {"label":"P", "x":10.5, "y":2.25},
- {"label":"{", "x":11.5, "y":2.25},
- {"label":"}", "x":12.5, "y":2.25},
- {"label":"|", "x":13.5, "y":2.25, "w":1.5},
- {"label":"Page Down", "x":15.25, "y":2.25},
-
- {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
- {"label":"A", "x":1.75, "y":3.25},
- {"label":"S", "x":2.75, "y":3.25},
- {"label":"D", "x":3.75, "y":3.25},
- {"label":"F", "x":4.75, "y":3.25},
- {"label":"G", "x":5.75, "y":3.25},
- {"label":"H", "x":6.75, "y":3.25},
- {"label":"J", "x":7.75, "y":3.25},
- {"label":"K", "x":8.75, "y":3.25},
- {"label":"L", "x":9.75, "y":3.25},
- {"label":":", "x":10.75, "y":3.25},
- {"label":"\"", "x":11.75, "y":3.25},
- {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
- {"label":"Home", "x":15.25, "y":3.25},
-
- {"label":"Shift", "x":0, "y":4.25, "w":2.25},
- {"label":"Z", "x":2.25, "y":4.25},
- {"label":"X", "x":3.25, "y":4.25},
- {"label":"C", "x":4.25, "y":4.25},
- {"label":"V", "x":5.25, "y":4.25},
- {"label":"B", "x":6.25, "y":4.25},
- {"label":"N", "x":7.25, "y":4.25},
- {"label":"M", "x":8.25, "y":4.25},
- {"label":"<", "x":9.25, "y":4.25},
- {"label":">", "x":10.25, "y":4.25},
- {"label":"?", "x":11.25, "y":4.25},
- {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
- {"label":"Up", "x":14.25, "y":4.5},
-
- {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
- {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
- {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
- {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
- {"label":"Alt", "x":10, "y":5.25},
- {"label":"Fn", "x":11, "y":5.25},
- {"label":"Ctrl", "x":12, "y":5.25},
- {"label":"Left", "x":13.25, "y":5.5},
- {"label":"Down", "x":14.25, "y":5.5},
- {"label":"Right", "x":15.25, "y":5.5} ]
- }
- }
-} \ 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 a921ee3e4c..0000000000
--- a/keyboards/keychron/q1/rev_0101/keymaps/via/info.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
- "keyboard_name": "Keychron Q1",
- "url": "https://github.com/Keychron",
- "maintainer": "lalalademaxiya1",
- "layouts": {
- "LAYOUT_all": {
- "layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"F1", "x":1.25, "y":0},
- {"label":"F2", "x":2.25, "y":0},
- {"label":"F3", "x":3.25, "y":0},
- {"label":"F4", "x":4.25, "y":0},
- {"label":"F5", "x":5.5, "y":0},
- {"label":"F6", "x":6.5, "y":0},
- {"label":"F7", "x":7.5, "y":0},
- {"label":"F8", "x":8.5, "y":0},
- {"label":"F9", "x":9.75, "y":0},
- {"label":"F10", "x":10.75, "y":0},
- {"label":"F11", "x":11.75, "y":0},
- {"label":"F12", "x":12.75, "y":0},
- {"label":"Delete", "x":14, "y":0},
-
- {"label":"Mute", "x":15.25, "y":0, "w":0.75},
- {"label":"Vol-", "x":16, "y":0, "w":0.75, "h":0.5},
- {"label":"Vol+", "x":16, "y":0.5, "w":0.75, "h":0.5},
-
- {"label":"~", "x":0, "y":1.25},
- {"label":"!", "x":1, "y":1.25},
- {"label":"@", "x":2, "y":1.25},
- {"label":"#", "x":3, "y":1.25},
- {"label":"$", "x":4, "y":1.25},
- {"label":"%", "x":5, "y":1.25},
- {"label":"^", "x":6, "y":1.25},
- {"label":"&", "x":7, "y":1.25},
- {"label":"*", "x":8, "y":1.25},
- {"label":"(", "x":9, "y":1.25},
- {"label":")", "x":10, "y":1.25},
- {"label":"_", "x":11, "y":1},
- {"label":"+", "x":12, "y":1.25},
- {"label":"Backspace", "x":13, "y":1.25, "w":2},
- {"label":"Page Up", "x":15.25, "y":1.25},
-
- {"label":"Tab", "x":0, "y":2.25, "w":1.5},
- {"label":"Q", "x":1.5, "y":2.25},
- {"label":"W", "x":2.5, "y":2.25},
- {"label":"E", "x":3.5, "y":2.25},
- {"label":"R", "x":4.5, "y":2.25},
- {"label":"T", "x":5.5, "y":2.25},
- {"label":"Y", "x":6.5, "y":2.25},
- {"label":"U", "x":7.5, "y":2.25},
- {"label":"I", "x":8.5, "y":2.25},
- {"label":"O", "x":9.5, "y":2.25},
- {"label":"P", "x":10.5, "y":2.25},
- {"label":"{", "x":11.5, "y":2.25},
- {"label":"}", "x":12.5, "y":2.25},
- {"label":"|", "x":13.5, "y":2.25, "w":1.5},
- {"label":"Page Down", "x":15.25, "y":2.25},
-
- {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
- {"label":"A", "x":1.75, "y":3.25},
- {"label":"S", "x":2.75, "y":3.25},
- {"label":"D", "x":3.75, "y":3.25},
- {"label":"F", "x":4.75, "y":3.25},
- {"label":"G", "x":5.75, "y":3.25},
- {"label":"H", "x":6.75, "y":3.25},
- {"label":"J", "x":7.75, "y":3.25},
- {"label":"K", "x":8.75, "y":3.25},
- {"label":"L", "x":9.75, "y":3.25},
- {"label":":", "x":10.75, "y":3.25},
- {"label":"\"", "x":11.75, "y":3.25},
- {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
- {"label":"Home", "x":15.25, "y":3.25},
-
- {"label":"Shift", "x":0, "y":4.25, "w":2.25},
- {"label":"Z", "x":2.25, "y":4.25},
- {"label":"X", "x":3.25, "y":4.25},
- {"label":"C", "x":4.25, "y":4.25},
- {"label":"V", "x":5.25, "y":4.25},
- {"label":"B", "x":6.25, "y":4.25},
- {"label":"N", "x":7.25, "y":4.25},
- {"label":"M", "x":8.25, "y":4.25},
- {"label":"<", "x":9.25, "y":4.25},
- {"label":">", "x":10.25, "y":4.25},
- {"label":"?", "x":11.25, "y":4.25},
- {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
- {"label":"Up", "x":14.25, "y":4.5},
-
- {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
- {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
- {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
- {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
- {"label":"Alt", "x":10, "y":5.25},
- {"label":"Fn", "x":11, "y":5.25},
- {"label":"Ctrl", "x":12, "y":5.25},
- {"label":"Left", "x":13.25, "y":5.5},
- {"label":"Down", "x":14.25, "y":5.5},
- {"label":"Right", "x":15.25, "y":5.5} ]
- }
- }
-}
diff --git a/keyboards/keychron/q1/rev_0101/keymaps/via/keymap.c b/keyboards/keychron/q1/rev_0101/keymaps/via/keymap.c
index 1103f74427..ad053648e5 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 {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MAC_BASE] = LAYOUT_all(
- 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,
+ 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,
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,
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,
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,
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,
- 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),
+ KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[MAC_FN] = LAYOUT_all(
- 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_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,
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,
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,
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, 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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
[WIN_BASE] = LAYOUT_all(
- 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,
+ 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,
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,
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,
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,
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,
- 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),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[WIN_FN] = LAYOUT_all(
- 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_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,
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,
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,
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, 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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
};
#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 132003c4f1..e4e8205b71 100644
--- a/keyboards/keychron/q1/rev_0101/rev_0101.h
+++ b/keyboards/keychron/q1/rev_0101/rev_0101.h
@@ -21,12 +21,12 @@
#define xxx KC_NO
#define LAYOUT_all( \
- K00, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4E, K0E, \
+ K00, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4E, K57, K0E, K58, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K3C, \
- K50, K51, K52, K56, K57, K58, K5A, K5B, K5C, K5D, K4C, K5E \
+ K50, K51, K52, K56, K5A, K5B, K5C, K5D, K4C, K5E \
) { \
{ K00, xxx, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
{ 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 caf3ebf7c9..fb34a2427a 100644
--- a/keyboards/keychron/q2/rev_0110/info.json
+++ b/keyboards/keychron/q2/rev_0110/info.json
@@ -5,78 +5,78 @@
"layouts": {
"LAYOUT_ansi_67": {
"layout": [
- {"label":"Insert", "x":15.25, "y":0},
+ {"label":"Esc", "x":0, "y":0.25},
+ {"label":"1!", "x":1, "y":0.25},
+ {"label":"2@", "x":2, "y":0.25},
+ {"label":"3#", "x":3, "y":0.25},
+ {"label":"4$", "x":4, "y":0.25},
+ {"label":"5%", "x":5, "y":0.25},
+ {"label":"6^", "x":6, "y":0.25},
+ {"label":"7&", "x":7, "y":0.25},
+ {"label":"8*", "x":8, "y":0.25},
+ {"label":"9(", "x":9, "y":0.25},
+ {"label":"0)", "x":10, "y":0.25},
+ {"label":"-_", "x":11, "y":0.25},
+ {"label":"=+", "x":12, "y":0.25},
+ {"label":"Backspace", "x":13, "y":0.25, "w":2},
+ {"label":"Insert", "x":15.25, "y":0},
- {"label":"Esc", "x":0, "y":0.25},
- {"label":"!", "x":1, "y":0.25},
- {"label":"@", "x":2, "y":0.25},
- {"label":"", "x":3, "y":0.25},
- {"label":"$", "x":4, "y":0.25},
- {"label":"%", "x":5, "y":0.25},
- {"label":"^", "x":6, "y":0.25},
- {"label":"&", "x":7, "y":0.25},
- {"label":"*", "x":8, "y":0.25},
- {"label":"(", "x":9, "y":0.25},
- {"label":")", "x":10, "y":0.25},
- {"label":"_", "x":11, "y":0.25},
- {"label":"+", "x":12, "y":0.25},
- {"label":"Backspace", "x":13, "y":0.25, "w":2},
+ {"label":"Tab", "x":0, "y":1.25, "w":1.5},
+ {"label":"Q", "x":1.5, "y":1.25},
+ {"label":"W", "x":2.5, "y":1.25},
+ {"label":"E", "x":3.5, "y":1.25},
+ {"label":"R", "x":4.5, "y":1.25},
+ {"label":"T", "x":5.5, "y":1.25},
+ {"label":"Y", "x":6.5, "y":1.25},
+ {"label":"U", "x":7.5, "y":1.25},
+ {"label":"I", "x":8.5, "y":1.25},
+ {"label":"O", "x":9.5, "y":1.25},
+ {"label":"P", "x":10.5, "y":1.25},
+ {"label":"[{", "x":11.5, "y":1.25},
+ {"label":"]}", "x":12.5, "y":1.25},
+ {"label":"\\|", "x":13.5, "y":1.25, "w":1.5},
+ {"label":"Delete", "x":15.25, "y":1.25},
- {"label":"Tab", "x":0, "y":1.25, "w":1.5},
- {"label":"Q", "x":1.5, "y":1.25},
- {"label":"W", "x":2.5, "y":1.25},
- {"label":"E", "x":3.5, "y":1.25},
- {"label":"R", "x":4.5, "y":1.25},
- {"label":"T", "x":5.5, "y":1.25},
- {"label":"Y", "x":6.5, "y":1.25},
- {"label":"U", "x":7.5, "y":1.25},
- {"label":"I", "x":8.5, "y":1.25},
- {"label":"O", "x":9.5, "y":1.25},
- {"label":"P", "x":10.5, "y":1.25},
- {"label":"{", "x":11.5, "y":1.25},
- {"label":"}", "x":12.5, "y":1.25},
- {"label":"|", "x":13.5, "y":1.25, "w":1.5},
- {"label":"Delete", "x":15.25, "y":1.25},
+ {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
+ {"label":"A", "x":1.75, "y":2.25},
+ {"label":"S", "x":2.75, "y":2.25},
+ {"label":"D", "x":3.75, "y":2.25},
+ {"label":"F", "x":4.75, "y":2.25},
+ {"label":"G", "x":5.75, "y":2.25},
+ {"label":"H", "x":6.75, "y":2.25},
+ {"label":"J", "x":7.75, "y":2.25},
+ {"label":"K", "x":8.75, "y":2.25},
+ {"label":"L", "x":9.75, "y":2.25},
+ {"label":";:", "x":10.75, "y":2.25},
+ {"label":"'\"", "x":11.75, "y":2.25},
+ {"label":"Enter", "x":12.75, "y":2.25, "w":2.25},
+ {"label":"Home", "x":15.25, "y":2.25},
- {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
- {"label":"A", "x":1.75, "y":2.25},
- {"label":"S", "x":2.75, "y":2.25},
- {"label":"D", "x":3.75, "y":2.25},
- {"label":"F", "x":4.75, "y":2.25},
- {"label":"G", "x":5.75, "y":2.25},
- {"label":"H", "x":6.75, "y":2.25},
- {"label":"J", "x":7.75, "y":2.25},
- {"label":"K", "x":8.75, "y":2.25},
- {"label":"L", "x":9.75, "y":2.25},
- {"label":":", "x":10.75, "y":2.25},
- {"label":"\"", "x":11.75, "y":2.25},
- {"label":"Enter", "x":12.75, "y":2.25, "w":2.25},
- {"label":"Home", "x":15.25, "y":2.25},
+ {"label":"Shift", "x":0, "y":3.25, "w":2.25},
+ {"label":"Z", "x":2.25, "y":3.25},
+ {"label":"X", "x":3.25, "y":3.25},
+ {"label":"C", "x":4.25, "y":3.25},
+ {"label":"V", "x":5.25, "y":3.25},
+ {"label":"B", "x":6.25, "y":3.25},
+ {"label":"N", "x":7.25, "y":3.25},
+ {"label":"M", "x":8.25, "y":3.25},
+ {"label":",<", "x":9.25, "y":3.25},
+ {"label":".>", "x":10.25, "y":3.25},
+ {"label":"/?", "x":11.25, "y":3.25},
+ {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
+ {"label":"Up", "x":14.25, "y":3.5},
- {"label":"Shift", "x":0, "y":3.25, "w":2.25},
- {"label":"Z", "x":2.25, "y":3.25},
- {"label":"X", "x":3.25, "y":3.25},
- {"label":"C", "x":4.25, "y":3.25},
- {"label":"V", "x":5.25, "y":3.25},
- {"label":"B", "x":6.25, "y":3.25},
- {"label":"N", "x":7.25, "y":3.25},
- {"label":"M", "x":8.25, "y":3.25},
- {"label":"<", "x":9.25, "y":3.25},
- {"label":">", "x":10.25, "y":3.25},
- {"label":"?", "x":11.25, "y":3.25},
- {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
- {"label":"Up", "x":14.25, "y":3.5},
-
- {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
- {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
- {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
- {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
- {"label":"Alt", "x":10, "y":4.25},
- {"label":"Fn1", "x":11, "y":4.25},
- {"label":"Fn2", "x":12, "y":4.25},
- {"label":"Left", "x":13.25, "y":4.5},
- {"label":"Down", "x":14.25, "y":4.5},
- {"label":"Right", "x":15.25, "y":4.5} ]
+ {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
+ {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
+ {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
+ {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
+ {"label":"Alt", "x":10, "y":4.25},
+ {"label":"Fn1", "x":11, "y":4.25},
+ {"label":"Fn2", "x":12, "y":4.25},
+ {"label":"Left", "x":13.25, "y":4.5},
+ {"label":"Down", "x":14.25, "y":4.5},
+ {"label":"Right", "x":15.25, "y":4.5}
+ ]
}
}
}
diff --git a/keyboards/keychron/q2/rev_0111/info.json b/keyboards/keychron/q2/rev_0111/info.json
new file mode 100644
index 0000000000..f6ce1d9b27
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0111/info.json
@@ -0,0 +1,159 @@
+{
+ "keyboard_name": "Keychron Q2",
+ "url": "https://github.com/Keychron",
+ "maintainer": "lalalademaxiya1",
+ "layouts": {
+ "LAYOUT_ansi_67": {
+ "layout": [
+ {"label":"Esc", "x":0, "y":0.25},
+ {"label":"1!", "x":1, "y":0.25},
+ {"label":"2@", "x":2, "y":0.25},
+ {"label":"3#", "x":3, "y":0.25},
+ {"label":"4$", "x":4, "y":0.25},
+ {"label":"5%", "x":5, "y":0.25},
+ {"label":"6^", "x":6, "y":0.25},
+ {"label":"7&", "x":7, "y":0.25},
+ {"label":"8*", "x":8, "y":0.25},
+ {"label":"9(", "x":9, "y":0.25},
+ {"label":"0)", "x":10, "y":0.25},
+ {"label":"-_", "x":11, "y":0.25},
+ {"label":"=+", "x":12, "y":0.25},
+ {"label":"Backspace", "x":13, "y":0.25, "w":2},
+ {"label":"Mute", "x":15.25, "y":0},
+
+ {"label":"Tab", "x":0, "y":1.25, "w":1.5},
+ {"label":"Q", "x":1.5, "y":1.25},
+ {"label":"W", "x":2.5, "y":1.25},
+ {"label":"E", "x":3.5, "y":1.25},
+ {"label":"R", "x":4.5, "y":1.25},
+ {"label":"T", "x":5.5, "y":1.25},
+ {"label":"Y", "x":6.5, "y":1.25},
+ {"label":"U", "x":7.5, "y":1.25},
+ {"label":"I", "x":8.5, "y":1.25},
+ {"label":"O", "x":9.5, "y":1.25},
+ {"label":"P", "x":10.5, "y":1.25},
+ {"label":"[{", "x":11.5, "y":1.25},
+ {"label":"]}", "x":12.5, "y":1.25},
+ {"label":"\\|", "x":13.5, "y":1.25, "w":1.5},
+ {"label":"Delete", "x":15.25, "y":1.25},
+
+ {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
+ {"label":"A", "x":1.75, "y":2.25},
+ {"label":"S", "x":2.75, "y":2.25},
+ {"label":"D", "x":3.75, "y":2.25},
+ {"label":"F", "x":4.75, "y":2.25},
+ {"label":"G", "x":5.75, "y":2.25},
+ {"label":"H", "x":6.75, "y":2.25},
+ {"label":"J", "x":7.75, "y":2.25},
+ {"label":"K", "x":8.75, "y":2.25},
+ {"label":"L", "x":9.75, "y":2.25},
+ {"label":";:", "x":10.75, "y":2.25},
+ {"label":"'\"", "x":11.75, "y":2.25},
+ {"label":"Enter", "x":12.75, "y":2.25, "w":2.25},
+ {"label":"Home", "x":15.25, "y":2.25},
+
+ {"label":"Shift", "x":0, "y":3.25, "w":2.25},
+ {"label":"Z", "x":2.25, "y":3.25},
+ {"label":"X", "x":3.25, "y":3.25},
+ {"label":"C", "x":4.25, "y":3.25},
+ {"label":"V", "x":5.25, "y":3.25},
+ {"label":"B", "x":6.25, "y":3.25},
+ {"label":"N", "x":7.25, "y":3.25},
+ {"label":"M", "x":8.25, "y":3.25},
+ {"label":",<", "x":9.25, "y":3.25},
+ {"label":".>", "x":10.25, "y":3.25},
+ {"label":"/?", "x":11.25, "y":3.25},
+ {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
+ {"label":"Up", "x":14.25, "y":3.5},
+
+ {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
+ {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
+ {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
+ {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
+ {"label":"Alt", "x":10, "y":4.25},
+ {"label":"Fn1", "x":11, "y":4.25},
+ {"label":"Fn2", "x":12, "y":4.25},
+ {"label":"Left", "x":13.25, "y":4.5},
+ {"label":"Down", "x":14.25, "y":4.5},
+ {"label":"Right", "x":15.25, "y":4.5}
+ ]
+ },
+ "LAYOUT_all": {
+ "layout": [
+ {"label":"Esc", "x":0, "y":0.75},
+ {"label":"1!", "x":1, "y":0.75},
+ {"label":"2@", "x":2, "y":0.75},
+ {"label":"3#", "x":3, "y":0.75},
+ {"label":"4$", "x":4, "y":0.75},
+ {"label":"5%", "x":5, "y":0.75},
+ {"label":"6^", "x":6, "y":0.75},
+ {"label":"7&", "x":7, "y":0.75},
+ {"label":"8*", "x":8, "y":0.75},
+ {"label":"9(", "x":9, "y":0.75},
+ {"label":"0)", "x":10, "y":0.75},
+ {"label":"-_", "x":11, "y":0.75},
+ {"label":"=+", "x":12, "y":0.75},
+ {"label":"Backspace", "x":13, "y":0.75, "w":2},
+ {"label":"CCW", "x":15.15, "y":0, "w":0.6, "h":0.5},
+ {"label":"Mute", "x":15.25, "y":0.5},
+ {"label":"CW", "x":15.75, "y":0, "w":0.6, "h":0.5},
+
+ {"label":"Tab", "x":0, "y":1.75, "w":1.5},
+ {"label":"Q", "x":1.5, "y":1.75},
+ {"label":"W", "x":2.5, "y":1.75},
+ {"label":"E", "x":3.5, "y":1.75},
+ {"label":"R", "x":4.5, "y":1.75},
+ {"label":"T", "x":5.5, "y":1.75},
+ {"label":"Y", "x":6.5, "y":1.75},
+ {"label":"U", "x":7.5, "y":1.75},
+ {"label":"I", "x":8.5, "y":1.75},
+ {"label":"O", "x":9.5, "y":1.75},
+ {"label":"P", "x":10.5, "y":1.75},
+ {"label":"[{", "x":11.5, "y":1.75},
+ {"label":"]}", "x":12.5, "y":1.75},
+ {"label":"\\|", "x":13.5, "y":1.75, "w":1.5},
+ {"label":"Delete", "x":15.25, "y":1.75},
+
+ {"label":"Caps Lock", "x":0, "y":2.75, "w":1.75},
+ {"label":"A", "x":1.75, "y":2.75},
+ {"label":"S", "x":2.75, "y":2.75},
+ {"label":"D", "x":3.75, "y":2.75},
+ {"label":"F", "x":4.75, "y":2.75},
+ {"label":"G", "x":5.75, "y":2.75},
+ {"label":"H", "x":6.75, "y":2.75},
+ {"label":"J", "x":7.75, "y":2.75},
+ {"label":"K", "x":8.75, "y":2.75},
+ {"label":"L", "x":9.75, "y":2.75},
+ {"label":";:", "x":10.75, "y":2.75},
+ {"label":"'\"", "x":11.75, "y":2.75},
+ {"label":"Enter", "x":12.75, "y":2.75, "w":2.25},
+ {"label":"Home", "x":15.25, "y":2.75},
+
+ {"label":"Shift", "x":0, "y":3.75, "w":2.25},
+ {"label":"Z", "x":2.25, "y":3.75},
+ {"label":"X", "x":3.25, "y":3.75},
+ {"label":"C", "x":4.25, "y":3.75},
+ {"label":"V", "x":5.25, "y":3.75},
+ {"label":"B", "x":6.25, "y":3.75},
+ {"label":"N", "x":7.25, "y":3.75},
+ {"label":"M", "x":8.25, "y":3.75},
+ {"label":",<", "x":9.25, "y":3.75},
+ {"label":".>", "x":10.25, "y":3.75},
+ {"label":"/?", "x":11.25, "y":3.75},
+ {"label":"Shift", "x":12.25, "y":3.75, "w":1.75},
+ {"label":"Up", "x":14.25, "y":4},
+
+ {"label":"Ctrl", "x":0, "y":4.75, "w":1.25},
+ {"label":"Win", "x":1.25, "y":4.75, "w":1.25},
+ {"label":"Alt", "x":2.5, "y":4.75, "w":1.25},
+ {"label":"Space", "x":3.75, "y":4.75, "w":6.25},
+ {"label":"Alt", "x":10, "y":4.75},
+ {"label":"Fn1", "x":11, "y":4.75},
+ {"label":"Fn2", "x":12, "y":4.75},
+ {"label":"Left", "x":13.25, "y":5},
+ {"label":"Down", "x":14.25, "y":5},
+ {"label":"Right", "x":15.25, "y":5}
+ ]
+ }
+ }
+}
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 590ed6d115..0000000000
--- a/keyboards/keychron/q2/rev_0111/keymaps/default/info.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
- "keyboard_name": "Keychron Q2",
- "url": "https://github.com/Keychron",
- "maintainer": "lalalademaxiya1",
- "layouts": {
- "LAYOUT_ansi_": {
- "layout": [
- {"label":"Mute", "x":15.25, "y":0},
-
- {"label":"Esc", "x":0, "y":0.25},
- {"label":"!", "x":1, "y":0.25},
- {"label":"@", "x":2, "y":0.25},
- {"label":"", "x":3, "y":0.25},
- {"label":"$", "x":4, "y":0.25},
- {"label":"%", "x":5, "y":0.25},
- {"label":"^", "x":6, "y":0.25},
- {"label":"&", "x":7, "y":0.25},
- {"label":"*", "x":8, "y":0.25},
- {"label":"(", "x":9, "y":0.25},
- {"label":")", "x":10, "y":0.25},
- {"label":"_", "x":11, "y":0.25},
- {"label":"+", "x":12, "y":0.25},
- {"label":"Backspace", "x":13, "y":0.25, "w":2},
-
- {"label":"Tab", "x":0, "y":1.25, "w":1.5},
- {"label":"Q", "x":1.5, "y":1.25},
- {"label":"W", "x":2.5, "y":1.25},
- {"label":"E", "x":3.5, "y":1.25},
- {"label":"R", "x":4.5, "y":1.25},
- {"label":"T", "x":5.5, "y":1.25},
- {"label":"Y", "x":6.5, "y":1.25},
- {"label":"U", "x":7.5, "y":1.25},
- {"label":"I", "x":8.5, "y":1.25},
- {"label":"O", "x":9.5, "y":1.25},
- {"label":"P", "x":10.5, "y":1.25},
- {"label":"{", "x":11.5, "y":1.25},
- {"label":"}", "x":12.5, "y":1.25},
- {"label":"|", "x":13.5, "y":1.25, "w":1.5},
- {"label":"Delete", "x":15.25, "y":1.25},
-
- {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
- {"label":"A", "x":1.75, "y":2.25},
- {"label":"S", "x":2.75, "y":2.25},
- {"label":"D", "x":3.75, "y":2.25},
- {"label":"F", "x":4.75, "y":2.25},
- {"label":"G", "x":5.75, "y":2.25},
- {"label":"H", "x":6.75, "y":2.25},
- {"label":"J", "x":7.75, "y":2.25},
- {"label":"K", "x":8.75, "y":2.25},
- {"label":"L", "x":9.75, "y":2.25},
- {"label":":", "x":10.75, "y":2.25},
- {"label":"\"", "x":11.75, "y":2.25},
- {"label":"Enter", "x":12.75, "y":2.25, "w":2.25},
- {"label":"Home", "x":15.25, "y":2.25},
-
- {"label":"Shift", "x":0, "y":3.25, "w":2.25},
- {"label":"Z", "x":2.25, "y":3.25},
- {"label":"X", "x":3.25, "y":3.25},
- {"label":"C", "x":4.25, "y":3.25},
- {"label":"V", "x":5.25, "y":3.25},
- {"label":"B", "x":6.25, "y":3.25},
- {"label":"N", "x":7.25, "y":3.25},
- {"label":"M", "x":8.25, "y":3.25},
- {"label":"<", "x":9.25, "y":3.25},
- {"label":">", "x":10.25, "y":3.25},
- {"label":"?", "x":11.25, "y":3.25},
- {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
- {"label":"Up", "x":14.25, "y":3.5},
-
- {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
- {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
- {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
- {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
- {"label":"Alt", "x":10, "y":4.25},
- {"label":"Fn1", "x":11, "y":4.25},
- {"label":"Fn2", "x":12, "y":4.25},
- {"label":"Left", "x":13.25, "y":4.5},
- {"label":"Down", "x":14.25, "y":4.5},
- {"label":"Right", "x":15.25, "y":4.5} ]
- }
- }
-}
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 0e2ad8463f..0000000000
--- a/keyboards/keychron/q2/rev_0111/keymaps/via/info.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
- "keyboard_name": "Keychron Q2",
- "url": "https://github.com/Keychron",
- "maintainer": "lalalademaxiya1",
- "layouts": {
- "LAYOUT_ansi_": {
- "layout": [
- {"label":"Mute", "x":15.25, "y":0, "w":0.75},
- {"label":"Vol-", "x":16, "y":0, "w":0.75, "h":0.5},
- {"label":"Vol+", "x":16, "y":0.5, "w":0.75, "h":0.5},
-
- {"label":"Esc", "x":0, "y":0.25},
- {"label":"!", "x":1, "y":0.25},
- {"label":"@", "x":2, "y":0.25},
- {"label":"", "x":3, "y":0.25},
- {"label":"$", "x":4, "y":0.25},
- {"label":"%", "x":5, "y":0.25},
- {"label":"^", "x":6, "y":0.25},
- {"label":"&", "x":7, "y":0.25},
- {"label":"*", "x":8, "y":0.25},
- {"label":"(", "x":9, "y":0.25},
- {"label":")", "x":10, "y":0.25},
- {"label":"_", "x":11, "y":0.25},
- {"label":"+", "x":12, "y":0.25},
- {"label":"Backspace", "x":13, "y":0.25, "w":2},
-
- {"label":"Tab", "x":0, "y":1.25, "w":1.5},
- {"label":"Q", "x":1.5, "y":1.25},
- {"label":"W", "x":2.5, "y":1.25},
- {"label":"E", "x":3.5, "y":1.25},
- {"label":"R", "x":4.5, "y":1.25},
- {"label":"T", "x":5.5, "y":1.25},
- {"label":"Y", "x":6.5, "y":1.25},
- {"label":"U", "x":7.5, "y":1.25},
- {"label":"I", "x":8.5, "y":1.25},
- {"label":"O", "x":9.5, "y":1.25},
- {"label":"P", "x":10.5, "y":1.25},
- {"label":"{", "x":11.5, "y":1.25},
- {"label":"}", "x":12.5, "y":1.25},
- {"label":"|", "x":13.5, "y":1.25, "w":1.5},
- {"label":"Delete", "x":15.25, "y":1.25},
-
- {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
- {"label":"A", "x":1.75, "y":2.25},
- {"label":"S", "x":2.75, "y":2.25},
- {"label":"D", "x":3.75, "y":2.25},
- {"label":"F", "x":4.75, "y":2.25},
- {"label":"G", "x":5.75, "y":2.25},
- {"label":"H", "x":6.75, "y":2.25},
- {"label":"J", "x":7.75, "y":2.25},
- {"label":"K", "x":8.75, "y":2.25},
- {"label":"L", "x":9.75, "y":2.25},
- {"label":":", "x":10.75, "y":2.25},
- {"label":"\"", "x":11.75, "y":2.25},
- {"label":"Enter", "x":12.75, "y":2.25, "w":2.25},
- {"label":"Home", "x":15.25, "y":2.25},
-
- {"label":"Shift", "x":0, "y":3.25, "w":2.25},
- {"label":"Z", "x":2.25, "y":3.25},
- {"label":"X", "x":3.25, "y":3.25},
- {"label":"C", "x":4.25, "y":3.25},
- {"label":"V", "x":5.25, "y":3.25},
- {"label":"B", "x":6.25, "y":3.25},
- {"label":"N", "x":7.25, "y":3.25},
- {"label":"M", "x":8.25, "y":3.25},
- {"label":"<", "x":9.25, "y":3.25},
- {"label":">", "x":10.25, "y":3.25},
- {"label":"?", "x":11.25, "y":3.25},
- {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
- {"label":"Up", "x":14.25, "y":3.5},
-
- {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
- {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
- {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
- {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
- {"label":"Alt", "x":10, "y":4.25},
- {"label":"Fn1", "x":11, "y":4.25},
- {"label":"Fn2", "x":12, "y":4.25},
- {"label":"Left", "x":13.25, "y":4.5},
- {"label":"Down", "x":14.25, "y":4.5},
- {"label":"Right", "x":15.25, "y":4.5} ]
- }
- }
-}
diff --git a/keyboards/keychron/q2/rev_0111/keymaps/via/keymap.c b/keyboards/keychron/q2/rev_0111/keymaps/via/keymap.c
index 15cdbb027e..a22143eb02 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 {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MAC_BASE] = LAYOUT_all(
- 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,
+ 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,
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,
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,
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,
- KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_VOLD, KC_VOLU, KC_RCMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+ KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
[WIN_BASE] = LAYOUT_all(
- 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,
+ 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,
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,
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,
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,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_VOLD, KC_VOLU, KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
[_FN1] = LAYOUT_all(
- 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_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,
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,
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, 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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
[_FN2] = LAYOUT_all(
- 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_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,
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,
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, 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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
[_FN3] = LAYOUT_all(
- 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_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,
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,
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, 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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
};
#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 0b1cfade1b..5033db61fc 100644
--- a/keyboards/keychron/q2/rev_0111/rev_0111.h
+++ b/keyboards/keychron/q2/rev_0111/rev_0111.h
@@ -21,11 +21,11 @@
#define XXX KC_NO
#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,\
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K47, K0E, K48, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,\
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E,\
K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
- K40, K41, K42, K46, K47, K48, K4A, K4B, K4C, K4D, K2C, K4E \
+ K40, K41, K42, K46, K4A, K4B, K4C, K4D, K2C, K4E \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, }, \
{ 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 83a7addfeb..5f0d4ab249 100644
--- a/keyboards/keychron/q2/rev_0112/info.json
+++ b/keyboards/keychron/q2/rev_0112/info.json
@@ -5,79 +5,79 @@
"layouts": {
"LAYOUT_iso_68": {
"layout": [
- {"label":"Insert", "x":15.25, "y":0},
+ {"label":"Esc", "x":0, "y":0.25},
+ {"label":"1!", "x":1, "y":0.25},
+ {"label":"2\"", "x":2, "y":0.25},
+ {"label":"3\u00a3", "x":3, "y":0.25},
+ {"label":"4$", "x":4, "y":0.25},
+ {"label":"5%", "x":5, "y":0.25},
+ {"label":"6^", "x":6, "y":0.25},
+ {"label":"7&", "x":7, "y":0.25},
+ {"label":"8*", "x":8, "y":0.25},
+ {"label":"9(", "x":9, "y":0.25},
+ {"label":"0)", "x":10, "y":0.25},
+ {"label":"-_", "x":11, "y":0.25},
+ {"label":"=+", "x":12, "y":0.25},
+ {"label":"Backspace", "x":13, "y":0.25, "w":2},
+ {"label":"Insert", "x":15.25, "y":0},
- {"label":"Esc", "x":0, "y":0.25},
- {"label":"!", "x":1, "y":0.25},
- {"label":"@", "x":2, "y":0.25},
- {"label":"", "x":3, "y":0.25},
- {"label":"$", "x":4, "y":0.25},
- {"label":"%", "x":5, "y":0.25},
- {"label":"^", "x":6, "y":0.25},
- {"label":"&", "x":7, "y":0.25},
- {"label":"*", "x":8, "y":0.25},
- {"label":"(", "x":9, "y":0.25},
- {"label":")", "x":10, "y":0.25},
- {"label":"_", "x":11, "y":0.25},
- {"label":"+", "x":12, "y":0.25},
- {"label":"Backspace", "x":13, "y":0.25, "w":2},
+ {"label":"Tab", "x":0, "y":1.25, "w":1.5},
+ {"label":"Q", "x":1.5, "y":1.25},
+ {"label":"W", "x":2.5, "y":1.25},
+ {"label":"E", "x":3.5, "y":1.25},
+ {"label":"R", "x":4.5, "y":1.25},
+ {"label":"T", "x":5.5, "y":1.25},
+ {"label":"Y", "x":6.5, "y":1.25},
+ {"label":"U", "x":7.5, "y":1.25},
+ {"label":"I", "x":8.5, "y":1.25},
+ {"label":"O", "x":9.5, "y":1.25},
+ {"label":"P", "x":10.5, "y":1.25},
+ {"label":"[{", "x":11.5, "y":1.25},
+ {"label":"]}", "x":12.5, "y":1.25},
+ {"label":"Delete", "x":15.25, "y":1.25},
- {"label":"Tab", "x":0, "y":1.25, "w":1.5},
- {"label":"Q", "x":1.5, "y":1.25},
- {"label":"W", "x":2.5, "y":1.25},
- {"label":"E", "x":3.5, "y":1.25},
- {"label":"R", "x":4.5, "y":1.25},
- {"label":"T", "x":5.5, "y":1.25},
- {"label":"Y", "x":6.5, "y":1.25},
- {"label":"U", "x":7.5, "y":1.25},
- {"label":"I", "x":8.5, "y":1.25},
- {"label":"O", "x":9.5, "y":1.25},
- {"label":"P", "x":10.5, "y":1.25},
- {"label":"{", "x":11.5, "y":1.25},
- {"label":"}", "x":12.5, "y":1.25},
- {"label":"Delete", "x":15.25, "y":1.25},
+ {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
+ {"label":"A", "x":1.75, "y":2.25},
+ {"label":"S", "x":2.75, "y":2.25},
+ {"label":"D", "x":3.75, "y":2.25},
+ {"label":"F", "x":4.75, "y":2.25},
+ {"label":"G", "x":5.75, "y":2.25},
+ {"label":"H", "x":6.75, "y":2.25},
+ {"label":"J", "x":7.75, "y":2.25},
+ {"label":"K", "x":8.75, "y":2.25},
+ {"label":"L", "x":9.75, "y":2.25},
+ {"label":";:", "x":10.75, "y":2.25},
+ {"label":"'@", "x":11.75, "y":2.25},
+ {"label":"#~", "x":12.75, "y":2.25},
+ {"label":"Enter", "x":13.75, "y":1.25, "w":1.25, "h":2},
+ {"label":"Home", "x":15.25, "y":2.25},
- {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
- {"label":"A", "x":1.75, "y":2.25},
- {"label":"S", "x":2.75, "y":2.25},
- {"label":"D", "x":3.75, "y":2.25},
- {"label":"F", "x":4.75, "y":2.25},
- {"label":"G", "x":5.75, "y":2.25},
- {"label":"H", "x":6.75, "y":2.25},
- {"label":"J", "x":7.75, "y":2.25},
- {"label":"K", "x":8.75, "y":2.25},
- {"label":"L", "x":9.75, "y":2.25},
- {"label":":", "x":10.75, "y":2.25},
- {"label":"\"", "x":11.75, "y":2.25},
- {"label":"#~", "x":12.75, "y":2.25},
- {"label":"Enter", "x":13.75, "y":2.25, "w":1.25}
- {"label":"Home", "x":15.25, "y":2.25},
+ {"label":"Shift", "x":0, "y":3.25, "w":1.25},
+ {"label":"\\|", "x":1.25, "y":3.25},
+ {"label":"Z", "x":2.25, "y":3.25},
+ {"label":"X", "x":3.25, "y":3.25},
+ {"label":"C", "x":4.25, "y":3.25},
+ {"label":"V", "x":5.25, "y":3.25},
+ {"label":"B", "x":6.25, "y":3.25},
+ {"label":"N", "x":7.25, "y":3.25},
+ {"label":"M", "x":8.25, "y":3.25},
+ {"label":",<", "x":9.25, "y":3.25},
+ {"label":".>", "x":10.25, "y":3.25},
+ {"label":"/?", "x":11.25, "y":3.25},
+ {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
+ {"label":"Up", "x":14.25, "y":3.5},
- {"label":"Shift", "x":0, "y":3.25, "w":1.25},
- {"label":"|", "x":1.25, "y":3.25},
- {"label":"Z", "x":2.25, "y":3.25},
- {"label":"X", "x":3.25, "y":3.25},
- {"label":"C", "x":4.25, "y":3.25},
- {"label":"V", "x":5.25, "y":3.25},
- {"label":"B", "x":6.25, "y":3.25},
- {"label":"N", "x":7.25, "y":3.25},
- {"label":"M", "x":8.25, "y":3.25},
- {"label":"<", "x":9.25, "y":3.25},
- {"label":">", "x":10.25, "y":3.25},
- {"label":"?", "x":11.25, "y":3.25},
- {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
- {"label":"Up", "x":14.25, "y":3.5},
-
- {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
- {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
- {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
- {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
- {"label":"Alt", "x":10, "y":4.25},
- {"label":"Fn1", "x":11, "y":4.25},
- {"label":"Fn2", "x":12, "y":4.25},
- {"label":"Left", "x":13.25, "y":4.5},
- {"label":"Down", "x":14.25, "y":4.5},
- {"label":"Right", "x":15.25, "y":4.5} ]
+ {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
+ {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
+ {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
+ {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
+ {"label":"Alt", "x":10, "y":4.25},
+ {"label":"Fn1", "x":11, "y":4.25},
+ {"label":"Fn2", "x":12, "y":4.25},
+ {"label":"Left", "x":13.25, "y":4.5},
+ {"label":"Down", "x":14.25, "y":4.5},
+ {"label":"Right", "x":15.25, "y":4.5}
+ ]
}
}
}
diff --git a/keyboards/keychron/q2/rev_0113/info.json b/keyboards/keychron/q2/rev_0113/info.json
new file mode 100644
index 0000000000..151f42455d
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0113/info.json
@@ -0,0 +1,161 @@
+{
+ "keyboard_name": "Keychron Q2",
+ "url": "https://github.com/Keychron",
+ "maintainer": "lalalademaxiya1",
+ "layouts": {
+ "LAYOUT_iso_68": {
+ "layout": [
+ {"label":"Esc", "x":0, "y":0.25},
+ {"label":"1!", "x":1, "y":0.25},
+ {"label":"2\"", "x":2, "y":0.25},
+ {"label":"3\u00a3", "x":3, "y":0.25},
+ {"label":"4$", "x":4, "y":0.25},
+ {"label":"5%", "x":5, "y":0.25},
+ {"label":"6^", "x":6, "y":0.25},
+ {"label":"7&", "x":7, "y":0.25},
+ {"label":"8*", "x":8, "y":0.25},
+ {"label":"9(", "x":9, "y":0.25},
+ {"label":"0)", "x":10, "y":0.25},
+ {"label":"-_", "x":11, "y":0.25},
+ {"label":"=+", "x":12, "y":0.25},
+ {"label":"Backspace", "x":13, "y":0.25, "w":2},
+ {"label":"Mute", "x":15.25, "y":0},
+
+ {"label":"Tab", "x":0, "y":1.25, "w":1.5},
+ {"label":"Q", "x":1.5, "y":1.25},
+ {"label":"W", "x":2.5, "y":1.25},
+ {"label":"E", "x":3.5, "y":1.25},
+ {"label":"R", "x":4.5, "y":1.25},
+ {"label":"T", "x":5.5, "y":1.25},
+ {"label":"Y", "x":6.5, "y":1.25},
+ {"label":"U", "x":7.5, "y":1.25},
+ {"label":"I", "x":8.5, "y":1.25},
+ {"label":"O", "x":9.5, "y":1.25},
+ {"label":"P", "x":10.5, "y":1.25},
+ {"label":"[{", "x":11.5, "y":1.25},
+ {"label":"]}", "x":12.5, "y":1.25},
+ {"label":"Delete", "x":15.25, "y":1.25},
+
+ {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
+ {"label":"A", "x":1.75, "y":2.25},
+ {"label":"S", "x":2.75, "y":2.25},
+ {"label":"D", "x":3.75, "y":2.25},
+ {"label":"F", "x":4.75, "y":2.25},
+ {"label":"G", "x":5.75, "y":2.25},
+ {"label":"H", "x":6.75, "y":2.25},
+ {"label":"J", "x":7.75, "y":2.25},
+ {"label":"K", "x":8.75, "y":2.25},
+ {"label":"L", "x":9.75, "y":2.25},
+ {"label":";:", "x":10.75, "y":2.25},
+ {"label":"'@", "x":11.75, "y":2.25},
+ {"label":"#~", "x":12.75, "y":2.25},
+ {"label":"Enter", "x":13.75, "y":1.25, "w":1.25, "h":2},
+ {"label":"Home", "x":15.25, "y":2.25},
+
+ {"label":"Shift", "x":0, "y":3.25, "w":1.25},
+ {"label":"\\|", "x":1.25, "y":3.25},
+ {"label":"Z", "x":2.25, "y":3.25},
+ {"label":"X", "x":3.25, "y":3.25},
+ {"label":"C", "x":4.25, "y":3.25},
+ {"label":"V", "x":5.25, "y":3.25},
+ {"label":"B", "x":6.25, "y":3.25},
+ {"label":"N", "x":7.25, "y":3.25},
+ {"label":"M", "x":8.25, "y":3.25},
+ {"label":",<", "x":9.25, "y":3.25},
+ {"label":".>", "x":10.25, "y":3.25},
+ {"label":"/?", "x":11.25, "y":3.25},
+ {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
+ {"label":"Up", "x":14.25, "y":3.5},
+
+ {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
+ {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
+ {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
+ {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
+ {"label":"Alt", "x":10, "y":4.25},
+ {"label":"Fn1", "x":11, "y":4.25},
+ {"label":"Fn2", "x":12, "y":4.25},
+ {"label":"Left", "x":13.25, "y":4.5},
+ {"label":"Down", "x":14.25, "y":4.5},
+ {"label":"Right", "x":15.25, "y":4.5}
+ ]
+ },
+ "LAYOUT_all": {
+ "layout": [
+ {"label":"Esc", "x":0, "y":0.75},
+ {"label":"1!", "x":1, "y":0.75},
+ {"label":"2\"", "x":2, "y":0.75},
+ {"label":"3\u00a3", "x":3, "y":0.75},
+ {"label":"4$", "x":4, "y":0.75},
+ {"label":"5%", "x":5, "y":0.75},
+ {"label":"6^", "x":6, "y":0.75},
+ {"label":"7&", "x":7, "y":0.75},
+ {"label":"8*", "x":8, "y":0.75},
+ {"label":"9(", "x":9, "y":0.75},
+ {"label":"0)", "x":10, "y":0.75},
+ {"label":"-_", "x":11, "y":0.75},
+ {"label":"=+", "x":12, "y":0.75},
+ {"label":"Backspace", "x":13, "y":0.75, "w":2},
+ {"label":"CCW", "x":15.15, "y":0, "w":0.6, "h":0.5},
+ {"label":"Mute", "x":15.25, "y":0.5},
+ {"label":"CW", "x":15.75, "y":0, "w":0.6, "h":0.5},
+
+ {"label":"Tab", "x":0, "y":1.75, "w":1.5},
+ {"label":"Q", "x":1.5, "y":1.75},
+ {"label":"W", "x":2.5, "y":1.75},
+ {"label":"E", "x":3.5, "y":1.75},
+ {"label":"R", "x":4.5, "y":1.75},
+ {"label":"T", "x":5.5, "y":1.75},
+ {"label":"Y", "x":6.5, "y":1.75},
+ {"label":"U", "x":7.5, "y":1.75},
+ {"label":"I", "x":8.5, "y":1.75},
+ {"label":"O", "x":9.5, "y":1.75},
+ {"label":"P", "x":10.5, "y":1.75},
+ {"label":"[{", "x":11.5, "y":1.75},
+ {"label":"]}", "x":12.5, "y":1.75},
+ {"label":"Delete", "x":15.25, "y":1.75},
+
+ {"label":"Caps Lock", "x":0, "y":2.75, "w":1.75},
+ {"label":"A", "x":1.75, "y":2.75},
+ {"label":"S", "x":2.75, "y":2.75},
+ {"label":"D", "x":3.75, "y":2.75},
+ {"label":"F", "x":4.75, "y":2.75},
+ {"label":"G", "x":5.75, "y":2.75},
+ {"label":"H", "x":6.75, "y":2.75},
+ {"label":"J", "x":7.75, "y":2.75},
+ {"label":"K", "x":8.75, "y":2.75},
+ {"label":"L", "x":9.75, "y":2.75},
+ {"label":";:", "x":10.75, "y":2.75},
+ {"label":"'@", "x":11.75, "y":2.75},
+ {"label":"#~", "x":12.75, "y":2.75},
+ {"label":"Enter", "x":13.75, "y":1.75, "w":1.25, "h":2},
+ {"label":"Home", "x":15.25, "y":2.75},
+
+ {"label":"Shift", "x":0, "y":3.75, "w":1.25},
+ {"label":"\\|", "x":1.25, "y":3.75},
+ {"label":"Z", "x":2.25, "y":3.75},
+ {"label":"X", "x":3.25, "y":3.75},
+ {"label":"C", "x":4.25, "y":3.75},
+ {"label":"V", "x":5.25, "y":3.75},
+ {"label":"B", "x":6.25, "y":3.75},
+ {"label":"N", "x":7.25, "y":3.75},
+ {"label":"M", "x":8.25, "y":3.75},
+ {"label":",<", "x":9.25, "y":3.75},
+ {"label":".>", "x":10.25, "y":3.75},
+ {"label":"/?", "x":11.25, "y":3.75},
+ {"label":"Shift", "x":12.25, "y":3.75, "w":1.75},
+ {"label":"Up", "x":14.25, "y":4},
+
+ {"label":"Ctrl", "x":0, "y":4.75, "w":1.25},
+ {"label":"Win", "x":1.25, "y":4.75, "w":1.25},
+ {"label":"Alt", "x":2.5, "y":4.75, "w":1.25},
+ {"label":"Space", "x":3.75, "y":4.75, "w":6.25},
+ {"label":"Alt", "x":10, "y":4.75},
+ {"label":"Fn1", "x":11, "y":4.75},
+ {"label":"Fn2", "x":12, "y":4.75},
+ {"label":"Left", "x":13.25, "y":5},
+ {"label":"Down", "x":14.25, "y":5},
+ {"label":"Right", "x":15.25, "y":5}
+ ]
+ }
+ }
+}
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 8448d4c995..0000000000
--- a/keyboards/keychron/q2/rev_0113/keymaps/default/info.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
- "keyboard_name": "Keychron Q2",
- "url": "https://github.com/Keychron",
- "maintainer": "lalalademaxiya1",
- "layouts": {
- "LAYOUT_iso_68": {
- "layout": [
- {"label":"Mute", "x":15.25, "y":0},
-
- {"label":"Esc", "x":0, "y":0.25},
- {"label":"!", "x":1, "y":0.25},
- {"label":"@", "x":2, "y":0.25},
- {"label":"", "x":3, "y":0.25},
- {"label":"$", "x":4, "y":0.25},
- {"label":"%", "x":5, "y":0.25},
- {"label":"^", "x":6, "y":0.25},
- {"label":"&", "x":7, "y":0.25},
- {"label":"*", "x":8, "y":0.25},
- {"label":"(", "x":9, "y":0.25},
- {"label":")", "x":10, "y":0.25},
- {"label":"_", "x":11, "y":0.25},
- {"label":"+", "x":12, "y":0.25},
- {"label":"Backspace", "x":13, "y":0.25, "w":2},
-
- {"label":"Tab", "x":0, "y":1.25, "w":1.5},
- {"label":"Q", "x":1.5, "y":1.25},
- {"label":"W", "x":2.5, "y":1.25},
- {"label":"E", "x":3.5, "y":1.25},
- {"label":"R", "x":4.5, "y":1.25},
- {"label":"T", "x":5.5, "y":1.25},
- {"label":"Y", "x":6.5, "y":1.25},
- {"label":"U", "x":7.5, "y":1.25},
- {"label":"I", "x":8.5, "y":1.25},
- {"label":"O", "x":9.5, "y":1.25},
- {"label":"P", "x":10.5, "y":1.25},
- {"label":"{", "x":11.5, "y":1.25},
- {"label":"}", "x":12.5, "y":1.25},
- {"label":"Delete", "x":15.25, "y":1.25},
-
- {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
- {"label":"A", "x":1.75, "y":2.25},
- {"label":"S", "x":2.75, "y":2.25},
- {"label":"D", "x":3.75, "y":2.25},
- {"label":"F", "x":4.75, "y":2.25},
- {"label":"G", "x":5.75, "y":2.25},
- {"label":"H", "x":6.75, "y":2.25},
- {"label":"J", "x":7.75, "y":2.25},
- {"label":"K", "x":8.75, "y":2.25},
- {"label":"L", "x":9.75, "y":2.25},
- {"label":":", "x":10.75, "y":2.25},
- {"label":"\"", "x":11.75, "y":2.25},
- {"label":"#~", "x":12.75, "y":2.25},
- {"label":"Enter", "x":13.75, "y":2.25, "w":1.25},
- {"label":"Home", "x":15.25, "y":2.25},
-
- {"label":"Shift", "x":0, "y":3.25, "w":1.25},
- {"label":"|", "x":1.25, "y":3.25},
- {"label":"Z", "x":2.25, "y":3.25},
- {"label":"X", "x":3.25, "y":3.25},
- {"label":"C", "x":4.25, "y":3.25},
- {"label":"V", "x":5.25, "y":3.25},
- {"label":"B", "x":6.25, "y":3.25},
- {"label":"N", "x":7.25, "y":3.25},
- {"label":"M", "x":8.25, "y":3.25},
- {"label":"<", "x":9.25, "y":3.25},
- {"label":">", "x":10.25, "y":3.25},
- {"label":"?", "x":11.25, "y":3.25},
- {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
- {"label":"Up", "x":14.25, "y":3.5},
-
- {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
- {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
- {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
- {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
- {"label":"Alt", "x":10, "y":4.25},
- {"label":"Fn1", "x":11, "y":4.25},
- {"label":"Fn2", "x":12, "y":4.25},
- {"label":"Left", "x":13.25, "y":4.5},
- {"label":"Down", "x":14.25, "y":4.5},
- {"label":"Right", "x":15.25, "y":4.5} ]
- }
- }
-}
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 6111f83d23..0000000000
--- a/keyboards/keychron/q2/rev_0113/keymaps/via/info.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
- "keyboard_name": "Keychron Q2",
- "url": "https://github.com/Keychron",
- "maintainer": "lalalademaxiya1",
- "layouts": {
- "LAYOUT_iso_68": {
- "layout": [
- {"label":"Mute", "x":15.25, "y":0, "w":0.75},
- {"label":"Vol-", "x":16, "y":0, "w":0.75, "h":0.5},
- {"label":"Vol+", "x":16, "y":0.5, "w":0.75, "h":0.5},
-
- {"label":"Esc", "x":0, "y":0.25},
- {"label":"!", "x":1, "y":0.25},
- {"label":"@", "x":2, "y":0.25},
- {"label":"", "x":3, "y":0.25},
- {"label":"$", "x":4, "y":0.25},
- {"label":"%", "x":5, "y":0.25},
- {"label":"^", "x":6, "y":0.25},
- {"label":"&", "x":7, "y":0.25},
- {"label":"*", "x":8, "y":0.25},
- {"label":"(", "x":9, "y":0.25},
- {"label":")", "x":10, "y":0.25},
- {"label":"_", "x":11, "y":0.25},
- {"label":"+", "x":12, "y":0.25},
- {"label":"Backspace", "x":13, "y":0.25, "w":2},
-
- {"label":"Tab", "x":0, "y":1.25, "w":1.5},
- {"label":"Q", "x":1.5, "y":1.25},
- {"label":"W", "x":2.5, "y":1.25},
- {"label":"E", "x":3.5, "y":1.25},
- {"label":"R", "x":4.5, "y":1.25},
- {"label":"T", "x":5.5, "y":1.25},
- {"label":"Y", "x":6.5, "y":1.25},
- {"label":"U", "x":7.5, "y":1.25},
- {"label":"I", "x":8.5, "y":1.25},
- {"label":"O", "x":9.5, "y":1.25},
- {"label":"P", "x":10.5, "y":1.25},
- {"label":"{", "x":11.5, "y":1.25},
- {"label":"}", "x":12.5, "y":1.25},
- {"label":"Delete", "x":15.25, "y":1.25},
-
- {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
- {"label":"A", "x":1.75, "y":2.25},
- {"label":"S", "x":2.75, "y":2.25},
- {"label":"D", "x":3.75, "y":2.25},
- {"label":"F", "x":4.75, "y":2.25},
- {"label":"G", "x":5.75, "y":2.25},
- {"label":"H", "x":6.75, "y":2.25},
- {"label":"J", "x":7.75, "y":2.25},
- {"label":"K", "x":8.75, "y":2.25},
- {"label":"L", "x":9.75, "y":2.25},
- {"label":":", "x":10.75, "y":2.25},
- {"label":"\"", "x":11.75, "y":2.25},
- {"label":"#~", "x":12.75, "y":2.25},
- {"label":"Enter", "x":13.75, "y":2.25, "w":1.25},
- {"label":"Home", "x":15.25, "y":2.25},
-
- {"label":"Shift", "x":0, "y":3.25, "w":1.25},
- {"label":"|", "x":1.25, "y":3.25},
- {"label":"Z", "x":2.25, "y":3.25},
- {"label":"X", "x":3.25, "y":3.25},
- {"label":"C", "x":4.25, "y":3.25},
- {"label":"V", "x":5.25, "y":3.25},
- {"label":"B", "x":6.25, "y":3.25},
- {"label":"N", "x":7.25, "y":3.25},
- {"label":"M", "x":8.25, "y":3.25},
- {"label":"<", "x":9.25, "y":3.25},
- {"label":">", "x":10.25, "y":3.25},
- {"label":"?", "x":11.25, "y":3.25},
- {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
- {"label":"Up", "x":14.25, "y":3.5},
-
- {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
- {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
- {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
- {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
- {"label":"Alt", "x":10, "y":4.25},
- {"label":"Fn1", "x":11, "y":4.25},
- {"label":"Fn2", "x":12, "y":4.25},
- {"label":"Left", "x":13.25, "y":4.5},
- {"label":"Down", "x":14.25, "y":4.5},
- {"label":"Right", "x":15.25, "y":4.5} ]
- }
- }
-}
diff --git a/keyboards/keychron/q2/rev_0113/keymaps/via/keymap.c b/keyboards/keychron/q2/rev_0113/keymaps/via/keymap.c
index 9c7ad72be7..4e3b431bdf 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 {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MAC_BASE] = LAYOUT_all(
- 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,
+ 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,
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,
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,
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,
- KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_VOLD, KC_VOLU, KC_RCMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+ KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
[WIN_BASE] = LAYOUT_all(
- 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,
+ 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,
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,
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,
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,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_VOLD, KC_VOLU, KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
[_FN1] = LAYOUT_all(
- 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_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,
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, 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,
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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
[_FN2] = LAYOUT_all(
- 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_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,
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, 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,
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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
[_FN3] = LAYOUT_all(
- 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_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,
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, 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,
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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
};
#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 21d20463e9..3b0b2d3377 100644
--- a/keyboards/keychron/q2/rev_0113/rev_0113.h
+++ b/keyboards/keychron/q2/rev_0113/rev_0113.h
@@ -21,11 +21,11 @@
#define XXX KC_NO
#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,\
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K47, K0E, K48,\
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E,\
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E,\
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
- K40, K41, K42, K46, K47, K48, K4A, K4B, K4C, K4D, K2C, K4E \
+ K40, K41, K42, K46, K4A, K4B, K4C, K4D, K2C, K4E \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, }, \