aboutsummaryrefslogtreecommitdiff
path: root/keyboards/keychron/q1
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/keychron/q1')
-rw-r--r--keyboards/keychron/q1/ansi/ansi.c2
-rw-r--r--keyboards/keychron/q1/ansi/ansi.h19
-rw-r--r--keyboards/keychron/q1/ansi/config.h4
-rw-r--r--keyboards/keychron/q1/ansi/info.json179
-rw-r--r--keyboards/keychron/q1/ansi/rules.mk1
-rw-r--r--keyboards/keychron/q1/ansi_encoder/ansi_encoder.c2
-rw-r--r--keyboards/keychron/q1/ansi_encoder/ansi_encoder.h19
-rw-r--r--keyboards/keychron/q1/ansi_encoder/config.h4
-rw-r--r--keyboards/keychron/q1/ansi_encoder/info.json175
-rw-r--r--keyboards/keychron/q1/ansi_encoder/keymaps/default/keymap.c2
-rw-r--r--keyboards/keychron/q1/ansi_encoder/keymaps/keychron/keymap.c2
-rw-r--r--keyboards/keychron/q1/ansi_encoder/keymaps/via/keymap.c2
-rw-r--r--keyboards/keychron/q1/ansi_encoder/rules.mk1
-rw-r--r--keyboards/keychron/q1/config.h6
-rw-r--r--keyboards/keychron/q1/iso/config.h4
-rw-r--r--keyboards/keychron/q1/iso/info.json177
-rw-r--r--keyboards/keychron/q1/iso/iso.c2
-rw-r--r--keyboards/keychron/q1/iso/iso.h19
-rw-r--r--keyboards/keychron/q1/iso/rules.mk1
-rw-r--r--keyboards/keychron/q1/iso_encoder/config.h4
-rw-r--r--keyboards/keychron/q1/iso_encoder/info.json177
-rw-r--r--keyboards/keychron/q1/iso_encoder/iso_encoder.c2
-rw-r--r--keyboards/keychron/q1/iso_encoder/iso_encoder.h19
-rw-r--r--keyboards/keychron/q1/iso_encoder/keymaps/default/keymap.c2
-rw-r--r--keyboards/keychron/q1/iso_encoder/keymaps/keychron/keymap.c2
-rw-r--r--keyboards/keychron/q1/iso_encoder/keymaps/via/keymap.c2
-rw-r--r--keyboards/keychron/q1/iso_encoder/rules.mk1
-rw-r--r--keyboards/keychron/q1/q1.c2
-rw-r--r--keyboards/keychron/q1/q1.h29
29 files changed, 383 insertions, 478 deletions
diff --git a/keyboards/keychron/q1/ansi/ansi.c b/keyboards/keychron/q1/ansi/ansi.c
index fc22d1aff3..ee586fef93 100644
--- a/keyboards/keychron/q1/ansi/ansi.c
+++ b/keyboards/keychron/q1/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/q1/ansi/ansi.h b/keyboards/keychron/q1/ansi/ansi.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q1/ansi/ansi.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ 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/q1/ansi/config.h b/keyboards/keychron/q1/ansi/config.h
index 0a30f7d82d..c6d4e44c87 100644
--- a/keyboards/keychron/q1/ansi/config.h
+++ b/keyboards/keychron/q1/ansi/config.h
@@ -16,10 +16,6 @@
#pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D3, D2, B3, B2, B1, B0 }
-#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 }
-
/* RGB Matrix Configuration */
#define DRIVER_1_LED_TOTAL 59
#define DRIVER_2_LED_TOTAL 23
diff --git a/keyboards/keychron/q1/ansi/info.json b/keyboards/keychron/q1/ansi/info.json
index 63602d71c5..b48eaee03e 100644
--- a/keyboards/keychron/q1/ansi/info.json
+++ b/keyboards/keychron/q1/ansi/info.json
@@ -4,102 +4,111 @@
"url": "https://github.com/Keychron",
"maintainer": "lalalademaxiya1",
"usb": {
- "vid": "0x3434",
- "pid": "0x0100",
- "device_version": "1.0.0"
+ "vid": "0x3434",
+ "pid": "0x0100",
+ "device_version": "1.0.0",
+ "force_nkro": true
},
+ "rgb_matrix": {
+ "driver": "IS31FL3733"
+ },
+ "matrix_pins": {
+ "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
+ "rows": ["D3", "D2", "B3", "B2", "B1", "B0"]
+ },
+ "diode_direction": "ROW2COL",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_ansi_82": {
"layout": [
- {"matrix":[0, 0], "x":0, "y":0},
- {"matrix":[0, 2], "x":1.25, "y":0},
- {"matrix":[0, 3], "x":2.25, "y":0},
- {"matrix":[0, 4], "x":3.25, "y":0},
- {"matrix":[0, 5], "x":4.25, "y":0},
- {"matrix":[0, 6], "x":5.5, "y":0},
- {"matrix":[0, 7], "x":6.5, "y":0},
- {"matrix":[0, 8], "x":7.5, "y":0},
- {"matrix":[0, 9], "x":8.5, "y":0},
- {"matrix":[0,10], "x":9.75, "y":0},
- {"matrix":[0,11], "x":10.75, "y":0},
- {"matrix":[0,12], "x":11.75, "y":0},
- {"matrix":[0,13], "x":12.75, "y":0},
- {"matrix":[4,14], "x":14, "y":0},
- {"matrix":[0,14], "x":15.25, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 2], "x": 1.25, "y": 0},
+ {"matrix": [0, 3], "x": 2.25, "y": 0},
+ {"matrix": [0, 4], "x": 3.25, "y": 0},
+ {"matrix": [0, 5], "x": 4.25, "y": 0},
+ {"matrix": [0, 6], "x": 5.5, "y": 0},
+ {"matrix": [0, 7], "x": 6.5, "y": 0},
+ {"matrix": [0, 8], "x": 7.5, "y": 0},
+ {"matrix": [0, 9], "x": 8.5, "y": 0},
+ {"matrix": [0, 10], "x": 9.75, "y": 0},
+ {"matrix": [0, 11], "x": 10.75, "y": 0},
+ {"matrix": [0, 12], "x": 11.75, "y": 0},
+ {"matrix": [0, 13], "x": 12.75, "y": 0},
+ {"matrix": [4, 14], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
- {"matrix":[1, 0], "x":0, "y":1},
- {"matrix":[1, 1], "x":1, "y":1},
- {"matrix":[1, 2], "x":2, "y":1},
- {"matrix":[1, 3], "x":3, "y":1},
- {"matrix":[1, 4], "x":4, "y":1},
- {"matrix":[1, 5], "x":5, "y":1},
- {"matrix":[1, 6], "x":6, "y":1},
- {"matrix":[1, 7], "x":7, "y":1},
- {"matrix":[1, 8], "x":8, "y":1},
- {"matrix":[1, 9], "x":9, "y":1},
- {"matrix":[1,10], "x":10, "y":1},
- {"matrix":[1,11], "x":11, "y":1},
- {"matrix":[1,12], "x":12, "y":1},
- {"matrix":[1,13], "x":13, "y":1, "w":2},
- {"matrix":[1,14], "x":15.25, "y":1},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 14], "x": 15.25, "y": 1},
- {"matrix":[2, 0], "x":0, "y":2, "w":1.5},
- {"matrix":[2, 1], "x":1.5, "y":2},
- {"matrix":[2, 2], "x":2.5, "y":2},
- {"matrix":[2, 3], "x":3.5, "y":2},
- {"matrix":[2, 4], "x":4.5, "y":2},
- {"matrix":[2, 5], "x":5.5, "y":2},
- {"matrix":[2, 6], "x":6.5, "y":2},
- {"matrix":[2, 7], "x":7.5, "y":2},
- {"matrix":[2, 8], "x":8.5, "y":2},
- {"matrix":[2, 9], "x":9.5, "y":2},
- {"matrix":[2,10], "x":10.5, "y":2},
- {"matrix":[2,11], "x":11.5, "y":2},
- {"matrix":[2,12], "x":12.5, "y":2},
- {"matrix":[2,13], "x":13.5, "y":2, "w":1.5},
- {"matrix":[2,14], "x":15.25, "y":2},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 14], "x": 15.25, "y": 2},
- {"matrix":[3, 0], "x":0, "y":3, "w":1.75},
- {"matrix":[3, 1], "x":1.75, "y":3},
- {"matrix":[3, 2], "x":2.75, "y":3},
- {"matrix":[3, 3], "x":3.75, "y":3},
- {"matrix":[3, 4], "x":4.75, "y":3},
- {"matrix":[3, 5], "x":5.75, "y":3},
- {"matrix":[3, 6], "x":6.75, "y":3},
- {"matrix":[3, 7], "x":7.75, "y":3},
- {"matrix":[3, 8], "x":8.75, "y":3},
- {"matrix":[3, 9], "x":9.75, "y":3},
- {"matrix":[3,10], "x":10.75, "y":3},
- {"matrix":[3,11], "x":11.75, "y":3},
- {"matrix":[3,13], "x":12.75, "y":3, "w":2.25},
- {"matrix":[3,14], "x":15.25, "y":3},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 14], "x": 15.25, "y": 3},
- {"matrix":[4, 0], "x":0, "y":4, "w":2.25},
- {"matrix":[4, 2], "x":2.25, "y":4},
- {"matrix":[4, 3], "x":3.25, "y":4},
- {"matrix":[4, 4], "x":4.25, "y":4},
- {"matrix":[4, 5], "x":5.25, "y":4},
- {"matrix":[4, 6], "x":6.25, "y":4},
- {"matrix":[4, 7], "x":7.25, "y":4},
- {"matrix":[4, 8], "x":8.25, "y":4},
- {"matrix":[4, 9], "x":9.25, "y":4},
- {"matrix":[4,10], "x":10.25, "y":4},
- {"matrix":[4,11], "x":11.25, "y":4},
- {"matrix":[4,13], "x":12.25, "y":4, "w":1.75},
- {"matrix":[3,12], "x":14.25, "y":4.25},
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [3, 12], "x": 14.25, "y": 4.25},
- {"matrix":[5, 0], "x":0, "y":5, "w":1.25},
- {"matrix":[5, 1], "x":1.25, "y":5, "w":1.25},
- {"matrix":[5, 2], "x":2.5, "y":5, "w":1.25},
- {"matrix":[5, 6], "x":3.75,"y":5, "w":6.25},
- {"matrix":[5,10], "x":10, "y":5},
- {"matrix":[5,11], "x":11, "y":5},
- {"matrix":[5,12], "x":12, "y":5},
- {"matrix":[5,13], "x":13.25, "y":5.25},
- {"matrix":[4,12], "x":14.25, "y":5.25},
- {"matrix":[5,14], "x":15.25, "y":5.25}
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5},
+ {"matrix": [5, 11], "x": 11, "y": 5},
+ {"matrix": [5, 12], "x": 12, "y": 5},
+ {"matrix": [5, 13], "x": 13.25, "y": 5.25},
+ {"matrix": [4, 12], "x": 14.25, "y": 5.25},
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25}
]
}
}
diff --git a/keyboards/keychron/q1/ansi/rules.mk b/keyboards/keychron/q1/ansi/rules.mk
index 395b661685..0379fdb94c 100644
--- a/keyboards/keychron/q1/ansi/rules.mk
+++ b/keyboards/keychron/q1/ansi/rules.mk
@@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
DIP_SWITCH_ENABLE = yes
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
LTO_ENABLE = yes
diff --git a/keyboards/keychron/q1/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q1/ansi_encoder/ansi_encoder.c
index 5909b993e3..bc559b3541 100644
--- a/keyboards/keychron/q1/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q1/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
const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/keychron/q1/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q1/ansi_encoder/ansi_encoder.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q1/ansi_encoder/ansi_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ 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/q1/ansi_encoder/config.h b/keyboards/keychron/q1/ansi_encoder/config.h
index a41976d560..28bbea9087 100644
--- a/keyboards/keychron/q1/ansi_encoder/config.h
+++ b/keyboards/keychron/q1/ansi_encoder/config.h
@@ -16,10 +16,6 @@
#pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D3, D2, B3, B2, B1, B0 }
-#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 }
-
/* RGB Matrix Configuration */
#define DRIVER_1_LED_TOTAL 59
#define DRIVER_2_LED_TOTAL 23
diff --git a/keyboards/keychron/q1/ansi_encoder/info.json b/keyboards/keychron/q1/ansi_encoder/info.json
index 1dcefeb7f4..f520724989 100644
--- a/keyboards/keychron/q1/ansi_encoder/info.json
+++ b/keyboards/keychron/q1/ansi_encoder/info.json
@@ -6,8 +6,17 @@
"usb": {
"vid": "0x3434",
"pid": "0x0101",
- "device_version": "1.0.0"
+ "device_version": "1.0.0",
+ "force_nkro": true
},
+ "rgb_matrix": {
+ "driver": "IS31FL3733"
+ },
+ "matrix_pins": {
+ "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
+ "rows": ["D3", "D2", "B3", "B2", "B1", "B0"]
+ },
+ "diode_direction": "ROW2COL",
"encoder": {
"rotary": [
{"pin_a": "E6", "pin_b": "B7"}
@@ -18,93 +27,93 @@
"layouts": {
"LAYOUT_ansi_82": {
"layout": [
- {"matrix":[0, 0], "x":0, "y":0},
- {"matrix":[0, 2], "x":1.25, "y":0},
- {"matrix":[0, 3], "x":2.25, "y":0},
- {"matrix":[0, 4], "x":3.25, "y":0},
- {"matrix":[0, 5], "x":4.25, "y":0},
- {"matrix":[0, 6], "x":5.5, "y":0},
- {"matrix":[0, 7], "x":6.5, "y":0},
- {"matrix":[0, 8], "x":7.5, "y":0},
- {"matrix":[0, 9], "x":8.5, "y":0},
- {"matrix":[0,10], "x":9.75, "y":0},
- {"matrix":[0,11], "x":10.75, "y":0},
- {"matrix":[0,12], "x":11.75, "y":0},
- {"matrix":[0,13], "x":12.75, "y":0},
- {"matrix":[4,14], "x":14, "y":0},
- {"matrix":[0,14], "x":15.25, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 2], "x": 1.25, "y": 0},
+ {"matrix": [0, 3], "x": 2.25, "y": 0},
+ {"matrix": [0, 4], "x": 3.25, "y": 0},
+ {"matrix": [0, 5], "x": 4.25, "y": 0},
+ {"matrix": [0, 6], "x": 5.5, "y": 0},
+ {"matrix": [0, 7], "x": 6.5, "y": 0},
+ {"matrix": [0, 8], "x": 7.5, "y": 0},
+ {"matrix": [0, 9], "x": 8.5, "y": 0},
+ {"matrix": [0, 10], "x": 9.75, "y": 0},
+ {"matrix": [0, 11], "x": 10.75, "y": 0},
+ {"matrix": [0, 12], "x": 11.75, "y": 0},
+ {"matrix": [0, 13], "x": 12.75, "y": 0},
+ {"matrix": [4, 14], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
- {"matrix":[1, 0], "x":0, "y":1},
- {"matrix":[1, 1], "x":1, "y":1},
- {"matrix":[1, 2], "x":2, "y":1},
- {"matrix":[1, 3], "x":3, "y":1},
- {"matrix":[1, 4], "x":4, "y":1},
- {"matrix":[1, 5], "x":5, "y":1},
- {"matrix":[1, 6], "x":6, "y":1},
- {"matrix":[1, 7], "x":7, "y":1},
- {"matrix":[1, 8], "x":8, "y":1},
- {"matrix":[1, 9], "x":9, "y":1},
- {"matrix":[1,10], "x":10, "y":1},
- {"matrix":[1,11], "x":11, "y":1},
- {"matrix":[1,12], "x":12, "y":1},
- {"matrix":[1,13], "x":13, "y":1, "w":2},
- {"matrix":[1,14], "x":15.25, "y":1},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 14], "x": 15.25, "y": 1},
- {"matrix":[2, 0], "x":0, "y":2, "w":1.5},
- {"matrix":[2, 1], "x":1.5, "y":2},
- {"matrix":[2, 2], "x":2.5, "y":2},
- {"matrix":[2, 3], "x":3.5, "y":2},
- {"matrix":[2, 4], "x":4.5, "y":2},
- {"matrix":[2, 5], "x":5.5, "y":2},
- {"matrix":[2, 6], "x":6.5, "y":2},
- {"matrix":[2, 7], "x":7.5, "y":2},
- {"matrix":[2, 8], "x":8.5, "y":2},
- {"matrix":[2, 9], "x":9.5, "y":2},
- {"matrix":[2,10], "x":10.5, "y":2},
- {"matrix":[2,11], "x":11.5, "y":2},
- {"matrix":[2,12], "x":12.5, "y":2},
- {"matrix":[2,13], "x":13.5, "y":2, "w":1.5},
- {"matrix":[2,14], "x":15.25, "y":2},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 14], "x": 15.25, "y": 2},
- {"matrix":[3, 0], "x":0, "y":3, "w":1.75},
- {"matrix":[3, 1], "x":1.75, "y":3},
- {"matrix":[3, 2], "x":2.75, "y":3},
- {"matrix":[3, 3], "x":3.75, "y":3},
- {"matrix":[3, 4], "x":4.75, "y":3},
- {"matrix":[3, 5], "x":5.75, "y":3},
- {"matrix":[3, 6], "x":6.75, "y":3},
- {"matrix":[3, 7], "x":7.75, "y":3},
- {"matrix":[3, 8], "x":8.75, "y":3},
- {"matrix":[3, 9], "x":9.75, "y":3},
- {"matrix":[3,10], "x":10.75, "y":3},
- {"matrix":[3,11], "x":11.75, "y":3},
- {"matrix":[3,13], "x":12.75, "y":3, "w":2.25},
- {"matrix":[3,14], "x":15.25, "y":3},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 14], "x": 15.25, "y": 3},
- {"matrix":[4, 0], "x":0, "y":4, "w":2.25},
- {"matrix":[4, 2], "x":2.25, "y":4},
- {"matrix":[4, 3], "x":3.25, "y":4},
- {"matrix":[4, 4], "x":4.25, "y":4},
- {"matrix":[4, 5], "x":5.25, "y":4},
- {"matrix":[4, 6], "x":6.25, "y":4},
- {"matrix":[4, 7], "x":7.25, "y":4},
- {"matrix":[4, 8], "x":8.25, "y":4},
- {"matrix":[4, 9], "x":9.25, "y":4},
- {"matrix":[4,10], "x":10.25, "y":4},
- {"matrix":[4,11], "x":11.25, "y":4},
- {"matrix":[4,13], "x":12.25, "y":4, "w":1.75},
- {"matrix":[3,12], "x":14.25, "y":4.25},
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [3, 12], "x": 14.25, "y": 4.25},
- {"matrix":[5, 0], "x":0, "y":5, "w":1.25},
- {"matrix":[5, 1], "x":1.25, "y":5, "w":1.25},
- {"matrix":[5, 2], "x":2.5, "y":5, "w":1.25},
- {"matrix":[5, 6], "x":3.75,"y":5, "w":6.25},
- {"matrix":[5,10], "x":10, "y":5},
- {"matrix":[5,11], "x":11, "y":5},
- {"matrix":[5,12], "x":12, "y":5},
- {"matrix":[5,13], "x":13.25, "y":5.25},
- {"matrix":[4,12], "x":14.25, "y":5.25},
- {"matrix":[5,14], "x":15.25, "y":5.25}
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5},
+ {"matrix": [5, 11], "x": 11, "y": 5},
+ {"matrix": [5, 12], "x": 12, "y": 5},
+ {"matrix": [5, 13], "x": 13.25, "y": 5.25},
+ {"matrix": [4, 12], "x": 14.25, "y": 5.25},
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25}
]
}
}
diff --git a/keyboards/keychron/q1/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q1/ansi_encoder/keymaps/default/keymap.c
index 36cc7a50f8..a4febc93c7 100644
--- a/keyboards/keychron/q1/ansi_encoder/keymaps/default/keymap.c
+++ b/keyboards/keychron/q1/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[][NUM_ENCODERS][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/q1/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q1/ansi_encoder/keymaps/keychron/keymap.c
index 510287acec..88d0b49efd 100644
--- a/keyboards/keychron/q1/ansi_encoder/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/q1/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[][NUM_ENCODERS][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/q1/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q1/ansi_encoder/keymaps/via/keymap.c
index e63091e616..9372a1d814 100644
--- a/keyboards/keychron/q1/ansi_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q1/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[][NUM_ENCODERS][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/q1/ansi_encoder/rules.mk b/keyboards/keychron/q1/ansi_encoder/rules.mk
index f67fe2bf03..d60167579e 100644
--- a/keyboards/keychron/q1/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q1/ansi_encoder/rules.mk
@@ -13,5 +13,4 @@ AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes # Enable Encoder
DIP_SWITCH_ENABLE = yes
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
LTO_ENABLE = yes
diff --git a/keyboards/keychron/q1/config.h b/keyboards/keychron/q1/config.h
index a49ec41a06..c78453dc5f 100644
--- a/keyboards/keychron/q1/config.h
+++ b/keyboards/keychron/q1/config.h
@@ -16,9 +16,6 @@
#pragma once
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
/* RGB Matrix Driver Configuration */
#define DRIVER_COUNT 2
#define DRIVER_ADDR_1 0b1010000
@@ -30,9 +27,6 @@
/* Disable DIP switch in matrix data */
#define MATRIX_MASKED
-/* NKRO */
-#define FORCE_NKRO
-
/* Disable RGB lighting when PC is in suspend */
#define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/keychron/q1/iso/config.h b/keyboards/keychron/q1/iso/config.h
index b9b33cf320..cb7b05560a 100644
--- a/keyboards/keychron/q1/iso/config.h
+++ b/keyboards/keychron/q1/iso/config.h
@@ -16,10 +16,6 @@
#pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D3, D2, B3, B2, B1, B0 }
-#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 }
-
/* RGB Matrix Configuration */
#define DRIVER_1_LED_TOTAL 59
#define DRIVER_2_LED_TOTAL 24
diff --git a/keyboards/keychron/q1/iso/info.json b/keyboards/keychron/q1/iso/info.json
index d8f5205f5f..9caf6d6183 100644
--- a/keyboards/keychron/q1/iso/info.json
+++ b/keyboards/keychron/q1/iso/info.json
@@ -6,101 +6,110 @@
"usb": {
"vid": "0x3434",
"pid": "0x0102",
- "device_version": "1.0.0"
+ "device_version": "1.0.0",
+ "force_nkro": true
},
+ "rgb_matrix": {
+ "driver": "IS31FL3733"
+ },
+ "matrix_pins": {
+ "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
+ "rows": ["D3", "D2", "B3", "B2", "B1", "B0"]
+ },
+ "diode_direction": "ROW2COL",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_iso_83": {
"layout": [
- {"matrix":[0, 0], "x":0, "y":0},
- {"matrix":[0, 2], "x":1.25, "y":0},
- {"matrix":[0, 3], "x":2.25, "y":0},
- {"matrix":[0, 4], "x":3.25, "y":0},
- {"matrix":[0, 5], "x":4.25, "y":0},
- {"matrix":[0, 6], "x":5.5, "y":0},
- {"matrix":[0, 7], "x":6.5, "y":0},
- {"matrix":[0, 8], "x":7.5, "y":0},
- {"matrix":[0, 9], "x":8.5, "y":0},
- {"matrix":[0,10], "x":9.75, "y":0},
- {"matrix":[0,11], "x":10.75, "y":0},
- {"matrix":[0,12], "x":11.75, "y":0},
- {"matrix":[0,13], "x":12.75, "y":0},
- {"matrix":[4,14], "x":14, "y":0},
- {"matrix":[0,14], "x":15.25, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 2], "x": 1.25, "y": 0},
+ {"matrix": [0, 3], "x": 2.25, "y": 0},
+ {"matrix": [0, 4], "x": 3.25, "y": 0},
+ {"matrix": [0, 5], "x": 4.25, "y": 0},
+ {"matrix": [0, 6], "x": 5.5, "y": 0},
+ {"matrix": [0, 7], "x": 6.5, "y": 0},
+ {"matrix": [0, 8], "x": 7.5, "y": 0},
+ {"matrix": [0, 9], "x": 8.5, "y": 0},
+ {"matrix": [0, 10], "x": 9.75, "y": 0},
+ {"matrix": [0, 11], "x": 10.75, "y": 0},
+ {"matrix": [0, 12], "x": 11.75, "y": 0},
+ {"matrix": [0, 13], "x": 12.75, "y": 0},
+ {"matrix": [4, 14], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15.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, 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":[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, 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":[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,14], "x":15.25, "y":3.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, 14], "x": 15.25, "y": 3.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":1.75},
- {"matrix":[3,12], "x":14.25, "y":4.5},
+ {"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": 1.75},
+ {"matrix": [3, 12], "x": 14.25, "y": 4.5},
- {"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},
- {"matrix":[5,11], "x":11, "y":5.25},
- {"matrix":[5,12], "x":12, "y":5.25},
- {"matrix":[5,13], "x":13.25, "y":5.5},
- {"matrix":[4,12], "x":14.25, "y":5.5},
- {"matrix":[5,14], "x":15.25, "y":5.5}
+ {"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},
+ {"matrix": [5, 11], "x": 11, "y": 5.25},
+ {"matrix": [5, 12], "x": 12, "y": 5.25},
+ {"matrix": [5, 13], "x": 13.25, "y": 5.5},
+ {"matrix": [4, 12], "x": 14.25, "y": 5.5},
+ {"matrix": [5, 14], "x": 15.25, "y": 5.5}
]
}
}
diff --git a/keyboards/keychron/q1/iso/iso.c b/keyboards/keychron/q1/iso/iso.c
index c8e3165bd3..619d89dffc 100644
--- a/keyboards/keychron/q1/iso/iso.c
+++ b/keyboards/keychron/q1/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
const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/keychron/q1/iso/iso.h b/keyboards/keychron/q1/iso/iso.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q1/iso/iso.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ 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/q1/iso/rules.mk b/keyboards/keychron/q1/iso/rules.mk
index 395b661685..0379fdb94c 100644
--- a/keyboards/keychron/q1/iso/rules.mk
+++ b/keyboards/keychron/q1/iso/rules.mk
@@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
DIP_SWITCH_ENABLE = yes
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
LTO_ENABLE = yes
diff --git a/keyboards/keychron/q1/iso_encoder/config.h b/keyboards/keychron/q1/iso_encoder/config.h
index b52fb88383..c1e84e44d3 100644
--- a/keyboards/keychron/q1/iso_encoder/config.h
+++ b/keyboards/keychron/q1/iso_encoder/config.h
@@ -16,10 +16,6 @@
#pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D3, D2, B3, B2, B1, B0 }
-#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 }
-
/* DIP switch */
#define DIP_SWITCH_MATRIX_GRID { {0,1} }
diff --git a/keyboards/keychron/q1/iso_encoder/info.json b/keyboards/keychron/q1/iso_encoder/info.json
index e4dce374c8..a3aba1aed3 100644
--- a/keyboards/keychron/q1/iso_encoder/info.json
+++ b/keyboards/keychron/q1/iso_encoder/info.json
@@ -6,8 +6,17 @@
"usb": {
"vid": "0x3434",
"pid": "0x0103",
- "device_version": "1.0.2"
+ "device_version": "1.0.2",
+ "force_nkro": true
},
+ "rgb_matrix": {
+ "driver": "IS31FL3733"
+ },
+ "matrix_pins": {
+ "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
+ "rows": ["D3", "D2", "B3", "B2", "B1", "B0"]
+ },
+ "diode_direction": "ROW2COL",
"encoder": {
"rotary": [
{"pin_a": "E6", "pin_b": "B7"}
@@ -18,94 +27,94 @@
"layouts": {
"LAYOUT_iso_83": {
"layout": [
- {"matrix":[0, 0], "x":0, "y":0},
- {"matrix":[0, 2], "x":1.25, "y":0},
- {"matrix":[0, 3], "x":2.25, "y":0},
- {"matrix":[0, 4], "x":3.25, "y":0},
- {"matrix":[0, 5], "x":4.25, "y":0},
- {"matrix":[0, 6], "x":5.5, "y":0},
- {"matrix":[0, 7], "x":6.5, "y":0},
- {"matrix":[0, 8], "x":7.5, "y":0},
- {"matrix":[0, 9], "x":8.5, "y":0},
- {"matrix":[0,10], "x":9.75, "y":0},
- {"matrix":[0,11], "x":10.75, "y":0},
- {"matrix":[0,12], "x":11.75, "y":0},
- {"matrix":[0,13], "x":12.75, "y":0},
- {"matrix":[4,14], "x":14, "y":0},
- {"matrix":[0,14], "x":15.25, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 2], "x": 1.25, "y": 0},
+ {"matrix": [0, 3], "x": 2.25, "y": 0},
+ {"matrix": [0, 4], "x": 3.25, "y": 0},
+ {"matrix": [0, 5], "x": 4.25, "y": 0},
+ {"matrix": [0, 6], "x": 5.5, "y": 0},
+ {"matrix": [0, 7], "x": 6.5, "y": 0},
+ {"matrix": [0, 8], "x": 7.5, "y": 0},
+ {"matrix": [0, 9], "x": 8.5, "y": 0},
+ {"matrix": [0, 10], "x": 9.75, "y": 0},
+ {"matrix": [0, 11], "x": 10.75, "y": 0},
+ {"matrix": [0, 12], "x": 11.75, "y": 0},
+ {"matrix": [0, 13], "x": 12.75, "y": 0},
+ {"matrix": [4, 14], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15.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, 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":[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, 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":[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,14], "x":15.25, "y":3.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, 14], "x": 15.25, "y": 3.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":1.75},
- {"matrix":[3,12], "x":14.25, "y":4.5},
+ {"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": 1.75},
+ {"matrix": [3, 12], "x": 14.25, "y": 4.5},
- {"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},
- {"matrix":[5,11], "x":11, "y":5.25},
- {"matrix":[5,12], "x":12, "y":5.25},
- {"matrix":[5,13], "x":13.25, "y":5.5},
- {"matrix":[4,12], "x":14.25, "y":5.5},
- {"matrix":[5,14], "x":15.25, "y":5.5}
+ {"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},
+ {"matrix": [5, 11], "x": 11, "y": 5.25},
+ {"matrix": [5, 12], "x": 12, "y": 5.25},
+ {"matrix": [5, 13], "x": 13.25, "y": 5.5},
+ {"matrix": [4, 12], "x": 14.25, "y": 5.5},
+ {"matrix": [5, 14], "x": 15.25, "y": 5.5}
]
}
}
diff --git a/keyboards/keychron/q1/iso_encoder/iso_encoder.c b/keyboards/keychron/q1/iso_encoder/iso_encoder.c
index c6563ad318..c6b091fff1 100644
--- a/keyboards/keychron/q1/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q1/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/q1/iso_encoder/iso_encoder.h b/keyboards/keychron/q1/iso_encoder/iso_encoder.h
deleted file mode 100644
index d62d707b4a..0000000000
--- a/keyboards/keychron/q1/iso_encoder/iso_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ 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" \ No newline at end of file
diff --git a/keyboards/keychron/q1/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q1/iso_encoder/keymaps/default/keymap.c
index 840db80a5b..237d9a3f1e 100644
--- a/keyboards/keychron/q1/iso_encoder/keymaps/default/keymap.c
+++ b/keyboards/keychron/q1/iso_encoder/keymaps/default/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[][NUM_ENCODERS][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/q1/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q1/iso_encoder/keymaps/keychron/keymap.c
index d78878d5e9..b007e56fba 100644
--- a/keyboards/keychron/q1/iso_encoder/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/q1/iso_encoder/keymaps/keychron/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][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/q1/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q1/iso_encoder/keymaps/via/keymap.c
index 052fe8c58a..47f04d8a29 100644
--- a/keyboards/keychron/q1/iso_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q1/iso_encoder/keymaps/via/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][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/q1/iso_encoder/rules.mk b/keyboards/keychron/q1/iso_encoder/rules.mk
index 3eea458e72..d994ac1fad 100644
--- a/keyboards/keychron/q1/iso_encoder/rules.mk
+++ b/keyboards/keychron/q1/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 = IS31FL3733
RAW_ENABLE = yes
LTO_ENABLE = yes
diff --git a/keyboards/keychron/q1/q1.c b/keyboards/keychron/q1/q1.c
index aa0789e852..3df62c4339 100644
--- a/keyboards/keychron/q1/q1.c
+++ b/keyboards/keychron/q1/q1.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "q1.h"
+#include "quantum.h"
const matrix_row_t matrix_mask[] = {
0b0111111111111101,
diff --git a/keyboards/keychron/q1/q1.h b/keyboards/keychron/q1/q1.h
deleted file mode 100644
index d706779910..0000000000
--- a/keyboards/keychron/q1/q1.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2021 @ 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_q1_ansi)
-# include "ansi.h"
-#elif defined(KEYBOARD_keychron_q1_ansi_encoder)
-# include "ansi_encoder.h"
-#elif defined(KEYBOARD_keychron_q1_iso)
-# include "iso.h"
-#elif defined(KEYBOARD_keychron_q1_iso_encoder)
-# include "iso_encoder.h"
-#endif