aboutsummaryrefslogtreecommitdiff
path: root/keyboards/keychron/q3
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/keychron/q3')
-rw-r--r--keyboards/keychron/q3/ansi/ansi.c2
-rw-r--r--keyboards/keychron/q3/ansi/ansi.h19
-rw-r--r--keyboards/keychron/q3/ansi/info.json177
-rw-r--r--keyboards/keychron/q3/ansi/rules.mk1
-rw-r--r--keyboards/keychron/q3/ansi_encoder/ansi_encoder.c2
-rw-r--r--keyboards/keychron/q3/ansi_encoder/ansi_encoder.h19
-rw-r--r--keyboards/keychron/q3/ansi_encoder/info.json179
-rw-r--r--keyboards/keychron/q3/ansi_encoder/keymaps/default/keymap.c2
-rw-r--r--keyboards/keychron/q3/ansi_encoder/keymaps/keychron/keymap.c2
-rw-r--r--keyboards/keychron/q3/ansi_encoder/keymaps/via/keymap.c2
-rw-r--r--keyboards/keychron/q3/ansi_encoder/rules.mk1
-rw-r--r--keyboards/keychron/q3/iso/info.json179
-rw-r--r--keyboards/keychron/q3/iso/iso.c2
-rw-r--r--keyboards/keychron/q3/iso/iso.h19
-rw-r--r--keyboards/keychron/q3/iso/rules.mk1
-rw-r--r--keyboards/keychron/q3/iso_encoder/info.json181
-rw-r--r--keyboards/keychron/q3/iso_encoder/iso_encoder.c2
-rw-r--r--keyboards/keychron/q3/iso_encoder/iso_encoder.h19
-rw-r--r--keyboards/keychron/q3/iso_encoder/keymaps/default/keymap.c2
-rw-r--r--keyboards/keychron/q3/iso_encoder/keymaps/keychron/keymap.c2
-rw-r--r--keyboards/keychron/q3/iso_encoder/keymaps/via/keymap.c2
-rw-r--r--keyboards/keychron/q3/iso_encoder/rules.mk1
-rw-r--r--keyboards/keychron/q3/jis/info.json185
-rw-r--r--keyboards/keychron/q3/jis/jis.c2
-rw-r--r--keyboards/keychron/q3/jis/jis.h19
-rw-r--r--keyboards/keychron/q3/jis/rules.mk1
-rw-r--r--keyboards/keychron/q3/jis_encoder/info.json187
-rw-r--r--keyboards/keychron/q3/jis_encoder/jis_encoder.c2
-rw-r--r--keyboards/keychron/q3/jis_encoder/jis_encoder.h19
-rw-r--r--keyboards/keychron/q3/jis_encoder/keymaps/default/keymap.c2
-rw-r--r--keyboards/keychron/q3/jis_encoder/keymaps/keychron/keymap.c2
-rw-r--r--keyboards/keychron/q3/jis_encoder/keymaps/via/keymap.c2
-rw-r--r--keyboards/keychron/q3/jis_encoder/rules.mk1
-rw-r--r--keyboards/keychron/q3/q3.c2
-rw-r--r--keyboards/keychron/q3/q3.h33
35 files changed, 569 insertions, 704 deletions
diff --git a/keyboards/keychron/q3/ansi/ansi.c b/keyboards/keychron/q3/ansi/ansi.c
index beff3bc5ec..432a914058 100644
--- a/keyboards/keychron/q3/ansi/ansi.c
+++ b/keyboards/keychron/q3/ansi/ansi.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ansi.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/ansi/ansi.h b/keyboards/keychron/q3/ansi/ansi.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q3/ansi/ansi.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q3/ansi/info.json b/keyboards/keychron/q3/ansi/info.json
index 1ebffbff45..3f18242e45 100644
--- a/keyboards/keychron/q3/ansi/info.json
+++ b/keyboards/keychron/q3/ansi/info.json
@@ -8,103 +8,106 @@
"pid": "0x0120",
"device_version": "1.0.0"
},
+ "rgb_matrix": {
+ "driver": "CKLED2001"
+ },
"processor": "STM32L432",
"bootloader": "stm32-dfu",
"layouts": {
"LAYOUT_tkl_ansi": {
"layout": [
- {"matrix":[0, 0], "x":0, "y":0},
- {"matrix":[0, 1], "x":2, "y":0},
- {"matrix":[0, 2], "x":3, "y":0},
- {"matrix":[0, 3], "x":4, "y":0},
- {"matrix":[0, 4], "x":5, "y":0},
- {"matrix":[0, 5], "x":6.5, "y":0},
- {"matrix":[0, 6], "x":7.5, "y":0},
- {"matrix":[0, 7], "x":8.5, "y":0},
- {"matrix":[0, 8], "x":9.5, "y":0},
- {"matrix":[0, 9], "x":11, "y":0},
- {"matrix":[0,10], "x":12, "y":0},
- {"matrix":[0,11], "x":13, "y":0},
- {"matrix":[0,12], "x":14, "y":0},
- {"matrix":[0,14], "x":15.25, "y":0},
- {"matrix":[0,15], "x":16.25, "y":0},
- {"matrix":[3,14], "x":17.25, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [3, 14], "x": 17.25, "y": 0},
- {"matrix":[1, 0], "x":0, "y":1.25},
- {"matrix":[1, 1], "x":1, "y":1.25},
- {"matrix":[1, 2], "x":2, "y":1.25},
- {"matrix":[1, 3], "x":3, "y":1.25},
- {"matrix":[1, 4], "x":4, "y":1.25},
- {"matrix":[1, 5], "x":5, "y":1.25},
- {"matrix":[1, 6], "x":6, "y":1.25},
- {"matrix":[1, 7], "x":7, "y":1.25},
- {"matrix":[1, 8], "x":8, "y":1.25},
- {"matrix":[1, 9], "x":9, "y":1.25},
- {"matrix":[1,10], "x":10, "y":1.25},
- {"matrix":[1,11], "x":11, "y":1.25},
- {"matrix":[1,12], "x":12, "y":1.25},
- {"matrix":[1,13], "x":13, "y":1.25, "w":2},
- {"matrix":[1,14], "x":15.25, "y":1.25},
- {"matrix":[1,15], "x":16.25, "y":1.25},
- {"matrix":[3,15], "x":17.25, "y":1.25},
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [3, 15], "x": 17.25, "y": 1.25},
- {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
- {"matrix":[2, 1], "x":1.5, "y":2.25},
- {"matrix":[2, 2], "x":2.5, "y":2.25},
- {"matrix":[2, 3], "x":3.5, "y":2.25},
- {"matrix":[2, 4], "x":4.5, "y":2.25},
- {"matrix":[2, 5], "x":5.5, "y":2.25},
- {"matrix":[2, 6], "x":6.5, "y":2.25},
- {"matrix":[2, 7], "x":7.5, "y":2.25},
- {"matrix":[2, 8], "x":8.5, "y":2.25},
- {"matrix":[2, 9], "x":9.5, "y":2.25},
- {"matrix":[2,10], "x":10.5, "y":2.25},
- {"matrix":[2,11], "x":11.5, "y":2.25},
- {"matrix":[2,12], "x":12.5, "y":2.25},
- {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
- {"matrix":[2,14], "x":15.25, "y":2.25},
- {"matrix":[2,15], "x":16.25, "y":2.25},
- {"matrix":[3,12], "x":17.25, "y":2.25},
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [3, 12], "x": 17.25, "y": 2.25},
- {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
- {"matrix":[3, 1], "x":1.75, "y":3.25},
- {"matrix":[3, 2], "x":2.75, "y":3.25},
- {"matrix":[3, 3], "x":3.75, "y":3.25},
- {"matrix":[3, 4], "x":4.75, "y":3.25},
- {"matrix":[3, 5], "x":5.75, "y":3.25},
- {"matrix":[3, 6], "x":6.75, "y":3.25},
- {"matrix":[3, 7], "x":7.75, "y":3.25},
- {"matrix":[3, 8], "x":8.75, "y":3.25},
- {"matrix":[3, 9], "x":9.75, "y":3.25},
- {"matrix":[3,10], "x":10.75, "y":3.25},
- {"matrix":[3,11], "x":11.75, "y":3.25},
- {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
- {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
- {"matrix":[4, 2], "x":2.25, "y":4.25},
- {"matrix":[4, 3], "x":3.25, "y":4.25},
- {"matrix":[4, 4], "x":4.25, "y":4.25},
- {"matrix":[4, 5], "x":5.25, "y":4.25},
- {"matrix":[4, 6], "x":6.25, "y":4.25},
- {"matrix":[4, 7], "x":7.25, "y":4.25},
- {"matrix":[4, 8], "x":8.25, "y":4.25},
- {"matrix":[4, 9], "x":9.25, "y":4.25},
- {"matrix":[4,10], "x":10.25, "y":4.25},
- {"matrix":[4,11], "x":11.25, "y":4.25},
- {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
- {"matrix":[4,15], "x":16.25, "y":4.25},
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
- {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
- {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
- {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
- {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
- {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
- {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
- {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
- {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
- {"matrix":[5,14], "x":15.25, "y":5.25},
- {"matrix":[5,15], "x":16.25, "y":5.25},
- {"matrix":[4,14], "x":17.25, "y":5.25}
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [4, 14], "x": 17.25, "y": 5.25}
]
}
}
diff --git a/keyboards/keychron/q3/ansi/rules.mk b/keyboards/keychron/q3/ansi/rules.mk
index 8669178c4c..566c476585 100644
--- a/keyboards/keychron/q3/ansi/rules.mk
+++ b/keyboards/keychron/q3/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
DIP_SWITCH_ENABLE = yes
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
LTO_ENABLE = yes
EEPROM_DRIVER = wear_leveling
WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c
index 13f6c26d2d..f873f77d12 100644
--- a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ansi_encoder.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q3/ansi_encoder/ansi_encoder.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q3/ansi_encoder/info.json b/keyboards/keychron/q3/ansi_encoder/info.json
index 3bd5a9d59a..b536bb235e 100644
--- a/keyboards/keychron/q3/ansi_encoder/info.json
+++ b/keyboards/keychron/q3/ansi_encoder/info.json
@@ -8,6 +8,9 @@
"pid": "0x0121",
"device_version": "1.0.0"
},
+ "rgb_matrix": {
+ "driver": "CKLED2001"
+ },
"encoder": {
"rotary": [
{"pin_a": "A10", "pin_b": "A8"}
@@ -18,99 +21,99 @@
"layouts": {
"LAYOUT_tkl_f13_ansi": {
"layout": [
- {"matrix":[0, 0], "x":0, "y":0},
- {"matrix":[0, 1], "x":1.25, "y":0},
- {"matrix":[0, 2], "x":2.25, "y":0},
- {"matrix":[0, 3], "x":3.25, "y":0},
- {"matrix":[0, 4], "x":4.25, "y":0},
- {"matrix":[0, 5], "x":5.5, "y":0},
- {"matrix":[0, 6], "x":6.5, "y":0},
- {"matrix":[0, 7], "x":7.5, "y":0},
- {"matrix":[0, 8], "x":8.5, "y":0},
- {"matrix":[0, 9], "x":9.75, "y":0},
- {"matrix":[0,10], "x":10.75, "y":0},
- {"matrix":[0,11], "x":11.75, "y":0},
- {"matrix":[0,12], "x":12.75, "y":0},
- {"matrix":[0,13], "x":14, "y":0},
- {"matrix":[0,14], "x":15.25, "y":0},
- {"matrix":[0,15], "x":16.25, "y":0},
- {"matrix":[3,14], "x":17.25, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [0, 9], "x": 9.75, "y": 0},
+ {"matrix": [0, 10], "x": 10.75, "y": 0},
+ {"matrix": [0, 11], "x": 11.75, "y": 0},
+ {"matrix": [0, 12], "x": 12.75, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [3, 14], "x": 17.25, "y": 0},
- {"matrix":[1, 0], "x":0, "y":1.25},
- {"matrix":[1, 1], "x":1, "y":1.25},
- {"matrix":[1, 2], "x":2, "y":1.25},
- {"matrix":[1, 3], "x":3, "y":1.25},
- {"matrix":[1, 4], "x":4, "y":1.25},
- {"matrix":[1, 5], "x":5, "y":1.25},
- {"matrix":[1, 6], "x":6, "y":1.25},
- {"matrix":[1, 7], "x":7, "y":1.25},
- {"matrix":[1, 8], "x":8, "y":1.25},
- {"matrix":[1, 9], "x":9, "y":1.25},
- {"matrix":[1,10], "x":10, "y":1.25},
- {"matrix":[1,11], "x":11, "y":1.25},
- {"matrix":[1,12], "x":12, "y":1.25},
- {"matrix":[1,13], "x":13, "y":1.25, "w":2},
- {"matrix":[1,14], "x":15.25, "y":1.25},
- {"matrix":[1,15], "x":16.25, "y":1.25},
- {"matrix":[3,15], "x":17.25, "y":1.25},
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [3, 15], "x": 17.25, "y": 1.25},
- {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
- {"matrix":[2, 1], "x":1.5, "y":2.25},
- {"matrix":[2, 2], "x":2.5, "y":2.25},
- {"matrix":[2, 3], "x":3.5, "y":2.25},
- {"matrix":[2, 4], "x":4.5, "y":2.25},
- {"matrix":[2, 5], "x":5.5, "y":2.25},
- {"matrix":[2, 6], "x":6.5, "y":2.25},
- {"matrix":[2, 7], "x":7.5, "y":2.25},
- {"matrix":[2, 8], "x":8.5, "y":2.25},
- {"matrix":[2, 9], "x":9.5, "y":2.25},
- {"matrix":[2,10], "x":10.5, "y":2.25},
- {"matrix":[2,11], "x":11.5, "y":2.25},
- {"matrix":[2,12], "x":12.5, "y":2.25},
- {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
- {"matrix":[2,14], "x":15.25, "y":2.25},
- {"matrix":[2,15], "x":16.25, "y":2.25},
- {"matrix":[3,12], "x":17.25, "y":2.25},
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [3, 12], "x": 17.25, "y": 2.25},
- {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
- {"matrix":[3, 1], "x":1.75, "y":3.25},
- {"matrix":[3, 2], "x":2.75, "y":3.25},
- {"matrix":[3, 3], "x":3.75, "y":3.25},
- {"matrix":[3, 4], "x":4.75, "y":3.25},
- {"matrix":[3, 5], "x":5.75, "y":3.25},
- {"matrix":[3, 6], "x":6.75, "y":3.25},
- {"matrix":[3, 7], "x":7.75, "y":3.25},
- {"matrix":[3, 8], "x":8.75, "y":3.25},
- {"matrix":[3, 9], "x":9.75, "y":3.25},
- {"matrix":[3,10], "x":10.75, "y":3.25},
- {"matrix":[3,11], "x":11.75, "y":3.25},
- {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
- {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
- {"matrix":[4, 2], "x":2.25, "y":4.25},
- {"matrix":[4, 3], "x":3.25, "y":4.25},
- {"matrix":[4, 4], "x":4.25, "y":4.25},
- {"matrix":[4, 5], "x":5.25, "y":4.25},
- {"matrix":[4, 6], "x":6.25, "y":4.25},
- {"matrix":[4, 7], "x":7.25, "y":4.25},
- {"matrix":[4, 8], "x":8.25, "y":4.25},
- {"matrix":[4, 9], "x":9.25, "y":4.25},
- {"matrix":[4,10], "x":10.25, "y":4.25},
- {"matrix":[4,11], "x":11.25, "y":4.25},
- {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
- {"matrix":[4,15], "x":16.25, "y":4.25},
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
- {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
- {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
- {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
- {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
- {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
- {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
- {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
- {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
- {"matrix":[5,14], "x":15.25, "y":5.25},
- {"matrix":[5,15], "x":16.25, "y":5.25},
- {"matrix":[4,14], "x":17.25, "y":5.25}
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [4, 14], "x": 17.25, "y": 5.25}
]
}
}
diff --git a/keyboards/keychron/q3/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q3/ansi_encoder/keymaps/default/keymap.c
index b154fa935a..832234c997 100644
--- a/keyboards/keychron/q3/ansi_encoder/keymaps/default/keymap.c
+++ b/keyboards/keychron/q3/ansi_encoder/keymaps/default/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][1][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
[WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
diff --git a/keyboards/keychron/q3/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q3/ansi_encoder/keymaps/keychron/keymap.c
index 5cd33b38e6..7a6944ff42 100644
--- a/keyboards/keychron/q3/ansi_encoder/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/q3/ansi_encoder/keymaps/keychron/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][1][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
[WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
diff --git a/keyboards/keychron/q3/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q3/ansi_encoder/keymaps/via/keymap.c
index 9369b6a60c..80230dae4b 100644
--- a/keyboards/keychron/q3/ansi_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q3/ansi_encoder/keymaps/via/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][1][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
[WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
diff --git a/keyboards/keychron/q3/ansi_encoder/rules.mk b/keyboards/keychron/q3/ansi_encoder/rules.mk
index a8eaf50f9a..95a153f689 100644
--- a/keyboards/keychron/q3/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q3/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes # Enable Encoder
DIP_SWITCH_ENABLE = yes
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
LTO_ENABLE = yes
EEPROM_DRIVER = wear_leveling
WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q3/iso/info.json b/keyboards/keychron/q3/iso/info.json
index b50fffd3a2..e858ee2245 100644
--- a/keyboards/keychron/q3/iso/info.json
+++ b/keyboards/keychron/q3/iso/info.json
@@ -8,104 +8,107 @@
"pid": "0x0122",
"device_version": "1.0.0"
},
+ "rgb_matrix": {
+ "driver": "CKLED2001"
+ },
"processor": "STM32L432",
"bootloader": "stm32-dfu",
"layouts": {
"LAYOUT_tkl_iso": {
"layout": [
- {"matrix":[0, 0], "x":0, "y":0},
- {"matrix":[0, 1], "x":2, "y":0},
- {"matrix":[0, 2], "x":3, "y":0},
- {"matrix":[0, 3], "x":4, "y":0},
- {"matrix":[0, 4], "x":5, "y":0},
- {"matrix":[0, 5], "x":6.5, "y":0},
- {"matrix":[0, 6], "x":7.5, "y":0},
- {"matrix":[0, 7], "x":8.5, "y":0},
- {"matrix":[0, 8], "x":9.5, "y":0},
- {"matrix":[0, 9], "x":11, "y":0},
- {"matrix":[0,10], "x":12, "y":0},
- {"matrix":[0,11], "x":13, "y":0},
- {"matrix":[0,12], "x":14, "y":0},
- {"matrix":[0,14], "x":15.25, "y":0},
- {"matrix":[0,15], "x":16.25, "y":0},
- {"matrix":[3,14], "x":17.25, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [3, 14], "x": 17.25, "y": 0},
- {"matrix":[1, 0], "x":0, "y":1.25},
- {"matrix":[1, 1], "x":1, "y":1.25},
- {"matrix":[1, 2], "x":2, "y":1.25},
- {"matrix":[1, 3], "x":3, "y":1.25},
- {"matrix":[1, 4], "x":4, "y":1.25},
- {"matrix":[1, 5], "x":5, "y":1.25},
- {"matrix":[1, 6], "x":6, "y":1.25},
- {"matrix":[1, 7], "x":7, "y":1.25},
- {"matrix":[1, 8], "x":8, "y":1.25},
- {"matrix":[1, 9], "x":9, "y":1.25},
- {"matrix":[1,10], "x":10, "y":1.25},
- {"matrix":[1,11], "x":11, "y":1.25},
- {"matrix":[1,12], "x":12, "y":1.25},
- {"matrix":[1,13], "x":13, "y":1.25, "w":2},
- {"matrix":[1,14], "x":15.25, "y":1.25},
- {"matrix":[1,15], "x":16.25, "y":1.25},
- {"matrix":[3,15], "x":17.25, "y":1.25},
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [3, 15], "x": 17.25, "y": 1.25},
- {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
- {"matrix":[2, 1], "x":1.5, "y":2.25},
- {"matrix":[2, 2], "x":2.5, "y":2.25},
- {"matrix":[2, 3], "x":3.5, "y":2.25},
- {"matrix":[2, 4], "x":4.5, "y":2.25},
- {"matrix":[2, 5], "x":5.5, "y":2.25},
- {"matrix":[2, 6], "x":6.5, "y":2.25},
- {"matrix":[2, 7], "x":7.5, "y":2.25},
- {"matrix":[2, 8], "x":8.5, "y":2.25},
- {"matrix":[2, 9], "x":9.5, "y":2.25},
- {"matrix":[2,10], "x":10.5, "y":2.25},
- {"matrix":[2,11], "x":11.5, "y":2.25},
- {"matrix":[2,12], "x":12.5, "y":2.25},
- {"matrix":[2,14], "x":15.25, "y":2.25},
- {"matrix":[2,15], "x":16.25, "y":2.25},
- {"matrix":[3,12], "x":17.25, "y":2.25},
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [3, 12], "x": 17.25, "y": 2.25},
- {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
- {"matrix":[3, 1], "x":1.75, "y":3.25},
- {"matrix":[3, 2], "x":2.75, "y":3.25},
- {"matrix":[3, 3], "x":3.75, "y":3.25},
- {"matrix":[3, 4], "x":4.75, "y":3.25},
- {"matrix":[3, 5], "x":5.75, "y":3.25},
- {"matrix":[3, 6], "x":6.75, "y":3.25},
- {"matrix":[3, 7], "x":7.75, "y":3.25},
- {"matrix":[3, 8], "x":8.75, "y":3.25},
- {"matrix":[3, 9], "x":9.75, "y":3.25},
- {"matrix":[3,10], "x":10.75, "y":3.25},
- {"matrix":[3,11], "x":11.75, "y":3.25},
- {"matrix":[3,13], "x":12.75, "y":3.25},
- {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+ {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
- {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
- {"matrix":[4, 1], "x":1.25, "y":4.25},
- {"matrix":[4, 2], "x":2.25, "y":4.25},
- {"matrix":[4, 3], "x":3.25, "y":4.25},
- {"matrix":[4, 4], "x":4.25, "y":4.25},
- {"matrix":[4, 5], "x":5.25, "y":4.25},
- {"matrix":[4, 6], "x":6.25, "y":4.25},
- {"matrix":[4, 7], "x":7.25, "y":4.25},
- {"matrix":[4, 8], "x":8.25, "y":4.25},
- {"matrix":[4, 9], "x":9.25, "y":4.25},
- {"matrix":[4,10], "x":10.25, "y":4.25},
- {"matrix":[4,11], "x":11.25, "y":4.25},
- {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
- {"matrix":[4,15], "x":16.25, "y":4.25},
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
- {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
- {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
- {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
- {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
- {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
- {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
- {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
- {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
- {"matrix":[5,14], "x":15.25, "y":5.25},
- {"matrix":[5,15], "x":16.25, "y":5.25},
- {"matrix":[4,14], "x":17.25, "y":5.25}
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [4, 14], "x": 17.25, "y": 5.25}
]
}
}
diff --git a/keyboards/keychron/q3/iso/iso.c b/keyboards/keychron/q3/iso/iso.c
index e753a39c1b..d747d55115 100644
--- a/keyboards/keychron/q3/iso/iso.c
+++ b/keyboards/keychron/q3/iso/iso.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "iso.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/iso/iso.h b/keyboards/keychron/q3/iso/iso.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q3/iso/iso.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q3/iso/rules.mk b/keyboards/keychron/q3/iso/rules.mk
index 8669178c4c..566c476585 100644
--- a/keyboards/keychron/q3/iso/rules.mk
+++ b/keyboards/keychron/q3/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
DIP_SWITCH_ENABLE = yes
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
LTO_ENABLE = yes
EEPROM_DRIVER = wear_leveling
WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q3/iso_encoder/info.json b/keyboards/keychron/q3/iso_encoder/info.json
index 6f1a24b372..6790d8b06f 100644
--- a/keyboards/keychron/q3/iso_encoder/info.json
+++ b/keyboards/keychron/q3/iso_encoder/info.json
@@ -8,6 +8,9 @@
"pid": "0x0123",
"device_version": "1.0.0"
},
+ "rgb_matrix": {
+ "driver": "CKLED2001"
+ },
"encoder": {
"rotary": [
{"pin_a": "A10", "pin_b": "A8"}
@@ -18,100 +21,100 @@
"layouts": {
"LAYOUT_tkl_f13_iso": {
"layout": [
- {"matrix":[0, 0], "x":0, "y":0},
- {"matrix":[0, 1], "x":1.25, "y":0},
- {"matrix":[0, 2], "x":2.25, "y":0},
- {"matrix":[0, 3], "x":3.25, "y":0},
- {"matrix":[0, 4], "x":4.25, "y":0},
- {"matrix":[0, 5], "x":5.5, "y":0},
- {"matrix":[0, 6], "x":6.5, "y":0},
- {"matrix":[0, 7], "x":7.5, "y":0},
- {"matrix":[0, 8], "x":8.5, "y":0},
- {"matrix":[0, 9], "x":9.75, "y":0},
- {"matrix":[0,10], "x":10.75, "y":0},
- {"matrix":[0,11], "x":11.75, "y":0},
- {"matrix":[0,12], "x":12.75, "y":0},
- {"matrix":[0,13], "x":14, "y":0},
- {"matrix":[0,14], "x":15.25, "y":0},
- {"matrix":[0,15], "x":16.25, "y":0},
- {"matrix":[3,14], "x":17.25, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [0, 9], "x": 9.75, "y": 0},
+ {"matrix": [0, 10], "x": 10.75, "y": 0},
+ {"matrix": [0, 11], "x": 11.75, "y": 0},
+ {"matrix": [0, 12], "x": 12.75, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [3, 14], "x": 17.25, "y": 0},
- {"matrix":[1, 0], "x":0, "y":1.25},
- {"matrix":[1, 1], "x":1, "y":1.25},
- {"matrix":[1, 2], "x":2, "y":1.25},
- {"matrix":[1, 3], "x":3, "y":1.25},
- {"matrix":[1, 4], "x":4, "y":1.25},
- {"matrix":[1, 5], "x":5, "y":1.25},
- {"matrix":[1, 6], "x":6, "y":1.25},
- {"matrix":[1, 7], "x":7, "y":1.25},
- {"matrix":[1, 8], "x":8, "y":1.25},
- {"matrix":[1, 9], "x":9, "y":1.25},
- {"matrix":[1,10], "x":10, "y":1.25},
- {"matrix":[1,11], "x":11, "y":1.25},
- {"matrix":[1,12], "x":12, "y":1.25},
- {"matrix":[1,13], "x":13, "y":1.25, "w":2},
- {"matrix":[1,14], "x":15.25, "y":1.25},
- {"matrix":[1,15], "x":16.25, "y":1.25},
- {"matrix":[3,15], "x":17.25, "y":1.25},
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [3, 15], "x": 17.25, "y": 1.25},
- {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
- {"matrix":[2, 1], "x":1.5, "y":2.25},
- {"matrix":[2, 2], "x":2.5, "y":2.25},
- {"matrix":[2, 3], "x":3.5, "y":2.25},
- {"matrix":[2, 4], "x":4.5, "y":2.25},
- {"matrix":[2, 5], "x":5.5, "y":2.25},
- {"matrix":[2, 6], "x":6.5, "y":2.25},
- {"matrix":[2, 7], "x":7.5, "y":2.25},
- {"matrix":[2, 8], "x":8.5, "y":2.25},
- {"matrix":[2, 9], "x":9.5, "y":2.25},
- {"matrix":[2,10], "x":10.5, "y":2.25},
- {"matrix":[2,11], "x":11.5, "y":2.25},
- {"matrix":[2,12], "x":12.5, "y":2.25},
- {"matrix":[2,14], "x":15.25, "y":2.25},
- {"matrix":[2,15], "x":16.25, "y":2.25},
- {"matrix":[3,12], "x":17.25, "y":2.25},
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [3, 12], "x": 17.25, "y": 2.25},
- {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
- {"matrix":[3, 1], "x":1.75, "y":3.25},
- {"matrix":[3, 2], "x":2.75, "y":3.25},
- {"matrix":[3, 3], "x":3.75, "y":3.25},
- {"matrix":[3, 4], "x":4.75, "y":3.25},
- {"matrix":[3, 5], "x":5.75, "y":3.25},
- {"matrix":[3, 6], "x":6.75, "y":3.25},
- {"matrix":[3, 7], "x":7.75, "y":3.25},
- {"matrix":[3, 8], "x":8.75, "y":3.25},
- {"matrix":[3, 9], "x":9.75, "y":3.25},
- {"matrix":[3,10], "x":10.75, "y":3.25},
- {"matrix":[3,11], "x":11.75, "y":3.25},
- {"matrix":[3,13], "x":12.75, "y":3.25},
- {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+ {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
- {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
- {"matrix":[4, 1], "x":1.25, "y":4.25},
- {"matrix":[4, 2], "x":2.25, "y":4.25},
- {"matrix":[4, 3], "x":3.25, "y":4.25},
- {"matrix":[4, 4], "x":4.25, "y":4.25},
- {"matrix":[4, 5], "x":5.25, "y":4.25},
- {"matrix":[4, 6], "x":6.25, "y":4.25},
- {"matrix":[4, 7], "x":7.25, "y":4.25},
- {"matrix":[4, 8], "x":8.25, "y":4.25},
- {"matrix":[4, 9], "x":9.25, "y":4.25},
- {"matrix":[4,10], "x":10.25, "y":4.25},
- {"matrix":[4,11], "x":11.25, "y":4.25},
- {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
- {"matrix":[4,15], "x":16.25, "y":4.25},
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
- {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
- {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
- {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
- {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
- {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
- {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
- {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
- {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
- {"matrix":[5,14], "x":15.25, "y":5.25},
- {"matrix":[5,15], "x":16.25, "y":5.25},
- {"matrix":[4,14], "x":17.25, "y":5.25}
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [4, 14], "x": 17.25, "y": 5.25}
]
}
}
diff --git a/keyboards/keychron/q3/iso_encoder/iso_encoder.c b/keyboards/keychron/q3/iso_encoder/iso_encoder.c
index 02aac01ddc..d2bb169aac 100644
--- a/keyboards/keychron/q3/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q3/iso_encoder/iso_encoder.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "iso_encoder.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/iso_encoder/iso_encoder.h b/keyboards/keychron/q3/iso_encoder/iso_encoder.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q3/iso_encoder/iso_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q3/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q3/iso_encoder/keymaps/default/keymap.c
index 999470fa87..caf2983919 100644
--- a/keyboards/keychron/q3/iso_encoder/keymaps/default/keymap.c
+++ b/keyboards/keychron/q3/iso_encoder/keymaps/default/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][1][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
[WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
diff --git a/keyboards/keychron/q3/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q3/iso_encoder/keymaps/keychron/keymap.c
index b7292e9fa4..336842a28f 100644
--- a/keyboards/keychron/q3/iso_encoder/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/q3/iso_encoder/keymaps/keychron/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][1][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
[WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
diff --git a/keyboards/keychron/q3/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q3/iso_encoder/keymaps/via/keymap.c
index 999470fa87..caf2983919 100644
--- a/keyboards/keychron/q3/iso_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q3/iso_encoder/keymaps/via/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][1][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
[WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
diff --git a/keyboards/keychron/q3/iso_encoder/rules.mk b/keyboards/keychron/q3/iso_encoder/rules.mk
index a8eaf50f9a..95a153f689 100644
--- a/keyboards/keychron/q3/iso_encoder/rules.mk
+++ b/keyboards/keychron/q3/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes # Enable Encoder
DIP_SWITCH_ENABLE = yes
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
LTO_ENABLE = yes
EEPROM_DRIVER = wear_leveling
WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q3/jis/info.json b/keyboards/keychron/q3/jis/info.json
index 69536c290c..772b8f4c18 100644
--- a/keyboards/keychron/q3/jis/info.json
+++ b/keyboards/keychron/q3/jis/info.json
@@ -8,107 +8,110 @@
"pid": "0x0124",
"device_version": "1.0.0"
},
+ "rgb_matrix": {
+ "driver": "CKLED2001"
+ },
"processor": "STM32L432",
"bootloader": "stm32-dfu",
"layouts": {
"LAYOUT_jis_91": {
"layout": [
- {"matrix":[0, 0], "x":0, "y":0},
- {"matrix":[0, 1], "x":2, "y":0},
- {"matrix":[0, 2], "x":3, "y":0},
- {"matrix":[0, 3], "x":4, "y":0},
- {"matrix":[0, 4], "x":5, "y":0},
- {"matrix":[0, 5], "x":6.5, "y":0},
- {"matrix":[0, 6], "x":7.5, "y":0},
- {"matrix":[0, 7], "x":8.5, "y":0},
- {"matrix":[0, 8], "x":9.5, "y":0},
- {"matrix":[0, 9], "x":11, "y":0},
- {"matrix":[0,10], "x":12, "y":0},
- {"matrix":[0,11], "x":13, "y":0},
- {"matrix":[0,12], "x":14, "y":0},
- {"matrix":[0,14], "x":15.25, "y":0},
- {"matrix":[0,15], "x":16.25, "y":0},
- {"matrix":[3,14], "x":17.25, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [3, 14], "x": 17.25, "y": 0},
- {"matrix":[1, 0], "x":0, "y":1.25},
- {"matrix":[1, 1], "x":1, "y":1.25},
- {"matrix":[1, 2], "x":2, "y":1.25},
- {"matrix":[1, 3], "x":3, "y":1.25},
- {"matrix":[1, 4], "x":4, "y":1.25},
- {"matrix":[1, 5], "x":5, "y":1.25},
- {"matrix":[1, 6], "x":6, "y":1.25},
- {"matrix":[1, 7], "x":7, "y":1.25},
- {"matrix":[1, 8], "x":8, "y":1.25},
- {"matrix":[1, 9], "x":9, "y":1.25},
- {"matrix":[1,10], "x":10, "y":1.25},
- {"matrix":[1,11], "x":11, "y":1.25},
- {"matrix":[1,12], "x":12, "y":1.25},
- {"matrix":[1,13], "x":13, "y":1.25},
- {"matrix":[0,13], "x":14, "y":1.25},
- {"matrix":[1,14], "x":15.25, "y":1.25},
- {"matrix":[1,15], "x":16.25, "y":1.25},
- {"matrix":[3,15], "x":17.25, "y":1.25},
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25},
+ {"matrix": [0, 13], "x": 14, "y": 1.25},
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [3, 15], "x": 17.25, "y": 1.25},
- {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
- {"matrix":[2, 1], "x":1.5, "y":2.25},
- {"matrix":[2, 2], "x":2.5, "y":2.25},
- {"matrix":[2, 3], "x":3.5, "y":2.25},
- {"matrix":[2, 4], "x":4.5, "y":2.25},
- {"matrix":[2, 5], "x":5.5, "y":2.25},
- {"matrix":[2, 6], "x":6.5, "y":2.25},
- {"matrix":[2, 7], "x":7.5, "y":2.25},
- {"matrix":[2, 8], "x":8.5, "y":2.25},
- {"matrix":[2, 9], "x":9.5, "y":2.25},
- {"matrix":[2,10], "x":10.5, "y":2.25},
- {"matrix":[2,11], "x":11.5, "y":2.25},
- {"matrix":[2,12], "x":12.5, "y":2.25},
- {"matrix":[2,14], "x":15.25, "y":2.25},
- {"matrix":[2,15], "x":16.25, "y":2.25},
- {"matrix":[3,12], "x":17.25, "y":2.25},
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [3, 12], "x": 17.25, "y": 2.25},
- {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
- {"matrix":[3, 1], "x":1.75, "y":3.25},
- {"matrix":[3, 2], "x":2.75, "y":3.25},
- {"matrix":[3, 3], "x":3.75, "y":3.25},
- {"matrix":[3, 4], "x":4.75, "y":3.25},
- {"matrix":[3, 5], "x":5.75, "y":3.25},
- {"matrix":[3, 6], "x":6.75, "y":3.25},
- {"matrix":[3, 7], "x":7.75, "y":3.25},
- {"matrix":[3, 8], "x":8.75, "y":3.25},
- {"matrix":[3, 9], "x":9.75, "y":3.25},
- {"matrix":[3,10], "x":10.75, "y":3.25},
- {"matrix":[3,11], "x":11.75, "y":3.25},
- {"matrix":[3,13], "x":12.75, "y":3.25},
- {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+ {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
- {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
- {"matrix":[4, 2], "x":2.25, "y":4.25},
- {"matrix":[4, 3], "x":3.25, "y":4.25},
- {"matrix":[4, 4], "x":4.25, "y":4.25},
- {"matrix":[4, 5], "x":5.25, "y":4.25},
- {"matrix":[4, 6], "x":6.25, "y":4.25},
- {"matrix":[4, 7], "x":7.25, "y":4.25},
- {"matrix":[4, 8], "x":8.25, "y":4.25},
- {"matrix":[4, 9], "x":9.25, "y":4.25},
- {"matrix":[4,10], "x":10.25, "y":4.25},
- {"matrix":[4,11], "x":11.25, "y":4.25},
- {"matrix":[4,12], "x":12.25, "y":4.25},
- {"matrix":[4,13], "x":13.25, "y":4.25, "w":1.75},
- {"matrix":[4,15], "x":16.25, "y":4.25},
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.25},
+ {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
- {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
- {"matrix":[5, 1], "x":1.25, "y":5.25},
- {"matrix":[5, 2], "x":2.25, "y":5.25, "w":1.25},
- {"matrix":[5, 3], "x":3.5, "y":5.25},
- {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5},
- {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25},
- {"matrix":[5,10], "x":10.25, "y":5.25, "w":1.25},
- {"matrix":[5,11], "x":11.5, "y":5.25, "w":1.25},
- {"matrix":[5,12], "x":12.75, "y":5.25},
- {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
- {"matrix":[5,14], "x":15.25, "y":5.25},
- {"matrix":[5,15], "x":16.25, "y":5.25},
- {"matrix":[4,14], "x":17.25, "y":5.25}
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25},
+ {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 3], "x": 3.5, "y": 5.25},
+ {"matrix": [5, 6], "x": 4.5, "y": 5.25, "w": 4.5},
+ {"matrix": [5, 9], "x": 9, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.75, "y": 5.25},
+ {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [4, 14], "x": 17.25, "y": 5.25}
]
}
}
diff --git a/keyboards/keychron/q3/jis/jis.c b/keyboards/keychron/q3/jis/jis.c
index 20983c6a5f..f262d3c7d8 100644
--- a/keyboards/keychron/q3/jis/jis.c
+++ b/keyboards/keychron/q3/jis/jis.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "jis.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/jis/jis.h b/keyboards/keychron/q3/jis/jis.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q3/jis/jis.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q3/jis/rules.mk b/keyboards/keychron/q3/jis/rules.mk
index 8669178c4c..566c476585 100644
--- a/keyboards/keychron/q3/jis/rules.mk
+++ b/keyboards/keychron/q3/jis/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
DIP_SWITCH_ENABLE = yes
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
LTO_ENABLE = yes
EEPROM_DRIVER = wear_leveling
WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q3/jis_encoder/info.json b/keyboards/keychron/q3/jis_encoder/info.json
index ed12472732..2bb4242c1b 100644
--- a/keyboards/keychron/q3/jis_encoder/info.json
+++ b/keyboards/keychron/q3/jis_encoder/info.json
@@ -8,6 +8,9 @@
"pid": "0x0125",
"device_version": "1.0.0"
},
+ "rgb_matrix": {
+ "driver": "CKLED2001"
+ },
"encoder": {
"rotary": [
{"pin_a": "A10", "pin_b": "A8"}
@@ -18,103 +21,103 @@
"layouts": {
"LAYOUT_jis_92": {
"layout": [
- {"matrix":[0, 0], "x":0, "y":0},
- {"matrix":[0, 1], "x":1.25, "y":0},
- {"matrix":[0, 2], "x":2.25, "y":0},
- {"matrix":[0, 3], "x":3.25, "y":0},
- {"matrix":[0, 4], "x":4.25, "y":0},
- {"matrix":[0, 5], "x":5.5, "y":0},
- {"matrix":[0, 6], "x":6.5, "y":0},
- {"matrix":[0, 7], "x":7.5, "y":0},
- {"matrix":[0, 8], "x":8.5, "y":0},
- {"matrix":[0, 9], "x":9.75, "y":0},
- {"matrix":[0,10], "x":10.75, "y":0},
- {"matrix":[0,11], "x":11.75, "y":0},
- {"matrix":[0,12], "x":12.75, "y":0},
- {"matrix":[0,13], "x":14, "y":0},
- {"matrix":[0,14], "x":15.25, "y":0},
- {"matrix":[0,15], "x":16.25, "y":0},
- {"matrix":[3,14], "x":17.25, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [0, 9], "x": 9.75, "y": 0},
+ {"matrix": [0, 10], "x": 10.75, "y": 0},
+ {"matrix": [0, 11], "x": 11.75, "y": 0},
+ {"matrix": [0, 12], "x": 12.75, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [3, 14], "x": 17.25, "y": 0},
- {"matrix":[1, 0], "x":0, "y":1.25},
- {"matrix":[1, 1], "x":1, "y":1.25},
- {"matrix":[1, 2], "x":2, "y":1.25},
- {"matrix":[1, 3], "x":3, "y":1.25},
- {"matrix":[1, 4], "x":4, "y":1.25},
- {"matrix":[1, 5], "x":5, "y":1.25},
- {"matrix":[1, 6], "x":6, "y":1.25},
- {"matrix":[1, 7], "x":7, "y":1.25},
- {"matrix":[1, 8], "x":8, "y":1.25},
- {"matrix":[1, 9], "x":9, "y":1.25},
- {"matrix":[1,10], "x":10, "y":1.25},
- {"matrix":[1,11], "x":11, "y":1.25},
- {"matrix":[1,12], "x":12, "y":1.25},
- {"matrix":[1,13], "x":13, "y":1.25},
- {"matrix":[5, 5], "x":14, "y":1.25},
- {"matrix":[1,14], "x":15.25, "y":1.25},
- {"matrix":[1,15], "x":16.25, "y":1.25},
- {"matrix":[3,15], "x":17.25, "y":1.25},
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25},
+ {"matrix": [5, 5], "x": 14, "y": 1.25},
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [3, 15], "x": 17.25, "y": 1.25},
- {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
- {"matrix":[2, 1], "x":1.5, "y":2.25},
- {"matrix":[2, 2], "x":2.5, "y":2.25},
- {"matrix":[2, 3], "x":3.5, "y":2.25},
- {"matrix":[2, 4], "x":4.5, "y":2.25},
- {"matrix":[2, 5], "x":5.5, "y":2.25},
- {"matrix":[2, 6], "x":6.5, "y":2.25},
- {"matrix":[2, 7], "x":7.5, "y":2.25},
- {"matrix":[2, 8], "x":8.5, "y":2.25},
- {"matrix":[2, 9], "x":9.5, "y":2.25},
- {"matrix":[2,10], "x":10.5, "y":2.25},
- {"matrix":[2,11], "x":11.5, "y":2.25},
- {"matrix":[2,12], "x":12.5, "y":2.25},
- {"matrix":[2,14], "x":15.25, "y":2.25},
- {"matrix":[2,15], "x":16.25, "y":2.25},
- {"matrix":[3,12], "x":17.25, "y":2.25},
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [3, 12], "x": 17.25, "y": 2.25},
- {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
- {"matrix":[3, 1], "x":1.75, "y":3.25},
- {"matrix":[3, 2], "x":2.75, "y":3.25},
- {"matrix":[3, 3], "x":3.75, "y":3.25},
- {"matrix":[3, 4], "x":4.75, "y":3.25},
- {"matrix":[3, 5], "x":5.75, "y":3.25},
- {"matrix":[3, 6], "x":6.75, "y":3.25},
- {"matrix":[3, 7], "x":7.75, "y":3.25},
- {"matrix":[3, 8], "x":8.75, "y":3.25},
- {"matrix":[3, 9], "x":9.75, "y":3.25},
- {"matrix":[3,10], "x":10.75, "y":3.25},
- {"matrix":[3,11], "x":11.75, "y":3.25},
- {"matrix":[3,13], "x":12.75, "y":3.25},
- {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+ {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
- {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
- {"matrix":[4, 2], "x":2.25, "y":4.25},
- {"matrix":[4, 3], "x":3.25, "y":4.25},
- {"matrix":[4, 4], "x":4.25, "y":4.25},
- {"matrix":[4, 5], "x":5.25, "y":4.25},
- {"matrix":[4, 6], "x":6.25, "y":4.25},
- {"matrix":[4, 7], "x":7.25, "y":4.25},
- {"matrix":[4, 8], "x":8.25, "y":4.25},
- {"matrix":[4, 9], "x":9.25, "y":4.25},
- {"matrix":[4,10], "x":10.25, "y":4.25},
- {"matrix":[4,11], "x":11.25, "y":4.25},
- {"matrix":[4,12], "x":12.25, "y":4.25},
- {"matrix":[4,13], "x":13.25, "y":4.25, "w":1.75},
- {"matrix":[4,15], "x":16.25, "y":4.25},
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.25},
+ {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
- {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
- {"matrix":[5, 1], "x":1.25, "y":5.25},
- {"matrix":[5, 2], "x":2.25, "y":5.25, "w":1.25},
- {"matrix":[5, 3], "x":3.5, "y":5.25},
- {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5},
- {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25},
- {"matrix":[5,10], "x":10.25, "y":5.25, "w":1.25},
- {"matrix":[5,11], "x":11.5, "y":5.25, "w":1.25},
- {"matrix":[5,12], "x":12.75, "y":5.25},
- {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
- {"matrix":[5,14], "x":15.25, "y":5.25},
- {"matrix":[5,15], "x":16.25, "y":5.25},
- {"matrix":[4,14], "x":17.25, "y":5.25}
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25},
+ {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 3], "x": 3.5, "y": 5.25},
+ {"matrix": [5, 6], "x": 4.5, "y": 5.25, "w": 4.5},
+ {"matrix": [5, 9], "x": 9, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.75, "y": 5.25},
+ {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [4, 14], "x": 17.25, "y": 5.25}
]
}
}
diff --git a/keyboards/keychron/q3/jis_encoder/jis_encoder.c b/keyboards/keychron/q3/jis_encoder/jis_encoder.c
index efaf5fc5f2..0a97c5ca68 100644
--- a/keyboards/keychron/q3/jis_encoder/jis_encoder.c
+++ b/keyboards/keychron/q3/jis_encoder/jis_encoder.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "jis_encoder.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/jis_encoder/jis_encoder.h b/keyboards/keychron/q3/jis_encoder/jis_encoder.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q3/jis_encoder/jis_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q3/jis_encoder/keymaps/default/keymap.c b/keyboards/keychron/q3/jis_encoder/keymaps/default/keymap.c
index ca51f194a2..30e85d79df 100644
--- a/keyboards/keychron/q3/jis_encoder/keymaps/default/keymap.c
+++ b/keyboards/keychron/q3/jis_encoder/keymaps/default/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// clang-format on
#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][1][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
[WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
diff --git a/keyboards/keychron/q3/jis_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q3/jis_encoder/keymaps/keychron/keymap.c
index 48532104f6..3a7e06abd6 100644
--- a/keyboards/keychron/q3/jis_encoder/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/q3/jis_encoder/keymaps/keychron/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// clang-format on
#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][1][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
[WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
diff --git a/keyboards/keychron/q3/jis_encoder/keymaps/via/keymap.c b/keyboards/keychron/q3/jis_encoder/keymaps/via/keymap.c
index f14ca16c8b..63618ce05a 100644
--- a/keyboards/keychron/q3/jis_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q3/jis_encoder/keymaps/via/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// clang-format on
#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][1][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
[WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
diff --git a/keyboards/keychron/q3/jis_encoder/rules.mk b/keyboards/keychron/q3/jis_encoder/rules.mk
index a8eaf50f9a..95a153f689 100644
--- a/keyboards/keychron/q3/jis_encoder/rules.mk
+++ b/keyboards/keychron/q3/jis_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes # Enable Encoder
DIP_SWITCH_ENABLE = yes
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
LTO_ENABLE = yes
EEPROM_DRIVER = wear_leveling
WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q3/q3.c b/keyboards/keychron/q3/q3.c
index 120013e77e..2bf8bf08a0 100644
--- a/keyboards/keychron/q3/q3.c
+++ b/keyboards/keychron/q3/q3.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "q3.h"
+#include "quantum.h"
#include "rgb_matrix.h"
// clang-format off
diff --git a/keyboards/keychron/q3/q3.h b/keyboards/keychron/q3/q3.h
deleted file mode 100644
index bc2d458bb7..0000000000
--- a/keyboards/keychron/q3/q3.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_keychron_q3_ansi)
-# include "ansi.h"
-#elif defined(KEYBOARD_keychron_q3_ansi_encoder)
-# include "ansi_encoder.h"
-#elif defined(KEYBOARD_keychron_q3_iso)
-# include "iso.h"
-#elif defined(KEYBOARD_keychron_q3_iso_encoder)
-# include "iso_encoder.h"
-#elif defined(KEYBOARD_keychron_q3_jis)
-# include "jis.h"
-#elif defined(KEYBOARD_keychron_q3_jis_encoder)
-# include "jis_encoder.h"
-#endif