aboutsummaryrefslogtreecommitdiff
path: root/keyboards/keychron/q11
diff options
context:
space:
mode:
authorNick Brassel <[email protected]>2024-02-28 21:47:37 +1100
committerNick Brassel <[email protected]>2024-02-28 21:47:37 +1100
commit4e369d405af6bba1adce6337b2e1b1ea1788566c (patch)
treeb0f020feff1809e37c9e7795d344929ff0bb290a /keyboards/keychron/q11
parent4e04da397ef643f8fcf4afbe1d19f63aee1fc561 (diff)
parentdd1706e468bb18dd7f7ae143de735a5d3be1bfb8 (diff)
downloadqmk_firmware-0.24.0.tar.gz
qmk_firmware-0.24.0.zip
Merge branch 'develop'0.24.0
Diffstat (limited to 'keyboards/keychron/q11')
-rwxr-xr-xkeyboards/keychron/q11/ansi_encoder/ansi_encoder.c180
-rwxr-xr-xkeyboards/keychron/q11/ansi_encoder/config.h3
-rwxr-xr-xkeyboards/keychron/q11/config.h25
-rwxr-xr-xkeyboards/keychron/q11/info.json14
-rwxr-xr-xkeyboards/keychron/q11/iso_encoder/config.h3
-rwxr-xr-xkeyboards/keychron/q11/iso_encoder/iso_encoder.c182
-rwxr-xr-xkeyboards/keychron/q11/q11.c19
7 files changed, 197 insertions, 229 deletions
diff --git a/keyboards/keychron/q11/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q11/ansi_encoder/ansi_encoder.c
index f7acae7add..49e428bc00 100755
--- a/keyboards/keychron/q11/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q11/ansi_encoder/ansi_encoder.c
@@ -17,112 +17,112 @@
#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
/* Refer to SNLED27351 manual for these locations
* driver
* | R location
* | | G location
* | | | B location
* | | | | */
- {0, A_2, C_2, B_2}, // ESC
- {0, A_3, C_3, B_3}, // F1
- {0, A_4, C_4, B_4}, // F2
- {0, A_5, C_5, B_5}, // F3
- {0, A_6, C_6, B_6}, // F4
- {0, A_7, C_7, B_7}, // F5
- {0, A_8, C_8, B_8}, // F6
+ {0, CB1_CA2, CB3_CA2, CB2_CA2}, // ESC
+ {0, CB1_CA3, CB3_CA3, CB2_CA3}, // F1
+ {0, CB1_CA4, CB3_CA4, CB2_CA4}, // F2
+ {0, CB1_CA5, CB3_CA5, CB2_CA5}, // F3
+ {0, CB1_CA6, CB3_CA6, CB2_CA6}, // F4
+ {0, CB1_CA7, CB3_CA7, CB2_CA7}, // F5
+ {0, CB1_CA8, CB3_CA8, CB2_CA8}, // F6
- {0, D_1, F_1, E_1}, // M1
- {0, D_2, F_2, E_2}, // `~
- {0, D_3, F_3, E_3}, // 1!
- {0, D_4, F_4, E_4}, // 2@
- {0, D_5, F_5, E_5}, // 3#
- {0, D_6, F_6, E_6}, // 4$
- {0, D_7, F_7, E_7}, // 5%
- {0, D_8, F_8, E_8}, // 6^
+ {0, CB4_CA1, CB6_CA1, CB5_CA1}, // M1
+ {0, CB4_CA2, CB6_CA2, CB5_CA2}, // `~
+ {0, CB4_CA3, CB6_CA3, CB5_CA3}, // 1!
+ {0, CB4_CA4, CB6_CA4, CB5_CA4}, // 2@
+ {0, CB4_CA5, CB6_CA5, CB5_CA5}, // 3#
+ {0, CB4_CA6, CB6_CA6, CB5_CA6}, // 4$
+ {0, CB4_CA7, CB6_CA7, CB5_CA7}, // 5%
+ {0, CB4_CA8, CB6_CA8, CB5_CA8}, // 6^
- {0, G_1, I_1, H_1}, // M2
- {0, G_2, I_2, H_2}, // TAB
- {0, G_3, I_3, H_3}, // Q
- {0, G_4, I_4, H_4}, // W
- {0, G_5, I_5, H_5}, // E
- {0, G_6, I_6, H_6}, // R
- {0, G_7, I_7, H_7}, // T
+ {0, CB7_CA1, CB9_CA1, CB8_CA1}, // M2
+ {0, CB7_CA2, CB9_CA2, CB8_CA2}, // TAB
+ {0, CB7_CA3, CB9_CA3, CB8_CA3}, // Q
+ {0, CB7_CA4, CB9_CA4, CB8_CA4}, // W
+ {0, CB7_CA5, CB9_CA5, CB8_CA5}, // E
+ {0, CB7_CA6, CB9_CA6, CB8_CA6}, // R
+ {0, CB7_CA7, CB9_CA7, CB8_CA7}, // T
- {0, J_1, L_1, K_1}, // M3
- {0, J_2, L_2, K_2}, // CapsJock
- {0, J_3, L_3, K_3}, // A
- {0, J_4, L_4, K_4}, // S
- {0, J_5, L_5, K_5}, // D
- {0, J_6, L_6, K_6}, // F
- {0, J_7, L_7, K_7}, // G
+ {0, CB10_CA1, CB12_CA1, CB11_CA1}, // M3
+ {0, CB10_CA2, CB12_CA2, CB11_CA2}, // CapsJock
+ {0, CB10_CA3, CB12_CA3, CB11_CA3}, // A
+ {0, CB10_CA4, CB12_CA4, CB11_CA4}, // S
+ {0, CB10_CA5, CB12_CA5, CB11_CA5}, // D
+ {0, CB10_CA6, CB12_CA6, CB11_CA6}, // F
+ {0, CB10_CA7, CB12_CA7, CB11_CA7}, // G
- {0, J_9, L_9, K_9}, // M4
- {0, J_11, L_11, K_11}, // Shift_J
- {0, J_12, L_12, K_12}, // Z
- {0, J_13, L_13, K_13}, // X
- {0, J_14, L_14, K_14}, // C
- {0, J_15, L_15, K_15}, // V
- {0, J_16, L_16, K_16}, // B
+ {0, CB10_CA9, CB12_CA9, CB11_CA9}, // M4
+ {0, CB10_CA11, CB12_CA11, CB11_CA11}, // Shift_J
+ {0, CB10_CA12, CB12_CA12, CB11_CA12}, // Z
+ {0, CB10_CA13, CB12_CA13, CB11_CA13}, // X
+ {0, CB10_CA14, CB12_CA14, CB11_CA14}, // C
+ {0, CB10_CA15, CB12_CA15, CB11_CA15}, // V
+ {0, CB10_CA16, CB12_CA16, CB11_CA16}, // B
- {0, G_9, I_9, H_9}, // M5
- {0, G_10, I_10, H_10}, // Ctrl_L
- {0, G_11, I_11, H_11}, // WGn_L
- {0, G_12, I_12, H_12}, // Alt_L
- {0, G_13, I_13, H_13}, // Fn
- {0, G_15, I_15, H_15}, // Space
+ {0, CB7_CA9, CB9_CA9, CB8_CA9}, // M5
+ {0, CB7_CA10, CB9_CA10, CB8_CA10}, // Ctrl_L
+ {0, CB7_CA11, CB9_CA11, CB8_CA11}, // WGn_L
+ {0, CB7_CA12, CB9_CA12, CB8_CA12}, // Alt_L
+ {0, CB7_CA13, CB9_CA13, CB8_CA13}, // Fn
+ {0, CB7_CA15, CB9_CA15, CB8_CA15}, // Space
- {0, A_16, C_16, B_16}, // F7
- {0, A_15, C_15, B_15}, // F8
- {0, A_14, C_14, B_14}, // F9
- {0, A_13, C_13, B_13}, // F11
- {0, A_12, C_12, B_12}, // F11
- {0, A_11, C_11, B_11}, // F12
- {0, A_10, C_10, B_10}, // INS
- {0, A_9, C_9, B_9}, // DEL
+ {0, CB1_CA16, CB3_CA16, CB2_CA16}, // F7
+ {0, CB1_CA15, CB3_CA15, CB2_CA15}, // F8
+ {0, CB1_CA14, CB3_CA14, CB2_CA14}, // F9
+ {0, CB1_CA13, CB3_CA13, CB2_CA13}, // F11
+ {0, CB1_CA12, CB3_CA12, CB2_CA12}, // F11
+ {0, CB1_CA11, CB3_CA11, CB2_CA11}, // F12
+ {0, CB1_CA10, CB3_CA10, CB2_CA10}, // INS
+ {0, CB1_CA9, CB3_CA9, CB2_CA9}, // DEL
- {0, D_16, F_16, E_16}, // 7&
- {0, D_15, F_15, E_15}, // 8*
- {0, D_14, F_14, E_14}, // 9(
- {0, D_13, F_13, E_13}, // 1)
- {0, D_12, F_12, E_12}, // -_
- {0, D_11, F_11, E_11}, // =+
- {0, D_10, F_10, E_10}, // BackSpace
- {0, D_8, F_8, E_8}, // PgUp
+ {0, CB4_CA16, CB6_CA16, CB5_CA16}, // 7&
+ {0, CB4_CA15, CB6_CA15, CB5_CA15}, // 8*
+ {0, CB4_CA14, CB6_CA14, CB5_CA14}, // 9(
+ {0, CB4_CA13, CB6_CA13, CB5_CA13}, // 1)
+ {0, CB4_CA12, CB6_CA12, CB5_CA12}, // -_
+ {0, CB4_CA11, CB6_CA11, CB5_CA11}, // =+
+ {0, CB4_CA10, CB6_CA10, CB5_CA10}, // BackSpace
+ {0, CB4_CA8, CB6_CA8, CB5_CA8}, // PgUp
- {0, G_16, I_16, H_16}, // Y
- {0, G_15, I_15, H_15}, // U
- {0, G_14, I_14, H_14}, // G
- {0, G_13, I_13, H_13}, // O
- {0, G_12, I_12, H_12}, // P
- {0, G_11, I_11, H_11}, // [
- {0, G_10, I_10, H_10}, // ]
- {0, G_9, I_9, H_9}, // \||
- {0, G_8, I_8, H_8}, // PgDn
+ {0, CB7_CA16, CB9_CA16, CB8_CA16}, // Y
+ {0, CB7_CA15, CB9_CA15, CB8_CA15}, // U
+ {0, CB7_CA14, CB9_CA14, CB8_CA14}, // G
+ {0, CB7_CA13, CB9_CA13, CB8_CA13}, // O
+ {0, CB7_CA12, CB9_CA12, CB8_CA12}, // P
+ {0, CB7_CA11, CB9_CA11, CB8_CA11}, // [
+ {0, CB7_CA10, CB9_CA10, CB8_CA10}, // ]
+ {0, CB7_CA9, CB9_CA9, CB8_CA9}, // \||
+ {0, CB7_CA8, CB9_CA8, CB8_CA8}, // PgDn
- {0, J_16, L_16, K_16}, // H
- {0, J_15, L_15, K_15}, // J
- {0, J_14, L_14, K_14}, // KKEY_PRESS_HOME
- {0, J_13, L_13, K_13}, // J
- {0, J_12, L_12, K_12}, // ;:
- {0, J_11, L_11, K_11}, // '"
- {0, J_9, L_9, K_9}, // Enter
- {0, J_8, L_8, K_8}, // Home
+ {0, CB10_CA16, CB12_CA16, CB11_CA16}, // H
+ {0, CB10_CA15, CB12_CA15, CB11_CA15}, // J
+ {0, CB10_CA14, CB12_CA14, CB11_CA14}, // KKEY_PRESS_HOME
+ {0, CB10_CA13, CB12_CA13, CB11_CA13}, // J
+ {0, CB10_CA12, CB12_CA12, CB11_CA12}, // ;:
+ {0, CB10_CA11, CB12_CA11, CB11_CA11}, // '"
+ {0, CB10_CA9, CB12_CA9, CB11_CA9}, // Enter
+ {0, CB10_CA8, CB12_CA8, CB11_CA8}, // Home
- {0, J_7, L_7, K_7}, // N
- {0, J_6, L_6, K_6}, // M
- {0, J_5, L_5, K_5}, // ,<
- {0, J_4, L_4, K_4}, // .>
- {0, J_3, L_3, K_3}, // ?/
- {0, J_2, L_2, K_2}, // Shift_R
- {0, J_1, L_1, K_1}, // Up
+ {0, CB10_CA7, CB12_CA7, CB11_CA7}, // N
+ {0, CB10_CA6, CB12_CA6, CB11_CA6}, // M
+ {0, CB10_CA5, CB12_CA5, CB11_CA5}, // ,<
+ {0, CB10_CA4, CB12_CA4, CB11_CA4}, // .>
+ {0, CB10_CA3, CB12_CA3, CB11_CA3}, // ?/
+ {0, CB10_CA2, CB12_CA2, CB11_CA2}, // Shift_R
+ {0, CB10_CA1, CB12_CA1, CB11_CA1}, // Up
- {0, G_6, I_6, H_6}, // Space
- {0, G_5, I_5, H_5}, // Win_R
- {0, G_4, I_4, H_4}, // Fn
- {0, G_3, I_3, H_3}, // Ctrl_R
- {0, G_2, I_2, H_2}, // Left
- {0, G_1, I_1, H_1}, // Down
- {0, G_7, I_7, H_7}, // Right
+ {0, CB7_CA6, CB9_CA6, CB8_CA6}, // Space
+ {0, CB7_CA5, CB9_CA5, CB8_CA5}, // Win_R
+ {0, CB7_CA4, CB9_CA4, CB8_CA4}, // Fn
+ {0, CB7_CA3, CB9_CA3, CB8_CA3}, // Ctrl_R
+ {0, CB7_CA2, CB9_CA2, CB8_CA2}, // Left
+ {0, CB7_CA1, CB9_CA1, CB8_CA1}, // Down
+ {0, CB7_CA7, CB9_CA7, CB8_CA7}, // Right
};
#endif
diff --git a/keyboards/keychron/q11/ansi_encoder/config.h b/keyboards/keychron/q11/ansi_encoder/config.h
index 60bdc493de..08632f0ce7 100755
--- a/keyboards/keychron/q11/ansi_encoder/config.h
+++ b/keyboards/keychron/q11/ansi_encoder/config.h
@@ -16,8 +16,5 @@
#pragma once
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 89
-
/* Enable caps-lock LED */
#define CAPS_LOCK_LED_INDEX 23
diff --git a/keyboards/keychron/q11/config.h b/keyboards/keychron/q11/config.h
index 0d6b9c9c48..b1b40c98ab 100755
--- a/keyboards/keychron/q11/config.h
+++ b/keyboards/keychron/q11/config.h
@@ -16,16 +16,6 @@
#pragma once
-// Connects each switch in the dip switch to the GPIO pin of the MCU
-#define DIP_SWITCH_PINS \
- { A8 }
-
-/* handedness */
-#define SPLIT_HAND_MATRIX_GRID A2, A15
-#define SPLIT_HAND_MATRIX_GRID_LOW_IS_RIGHT
-
-#define MATRIX_MASKED // actual mask is defined by `matrix_mask` in `q11.c`
-
/* RGB Matrix Driver Configuration */
#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
@@ -39,21 +29,12 @@
#define SNLED27351_CURRENT_TUNE \
{ 0x80, 0xFF, 0xFF, 0x80, 0xFF, 0xFF, 0x80, 0xFF, 0xFF, 0x80, 0xFF, 0xFF } // 300mA
-/* EEPROM Driver Configuration */
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
/* Split Keyboard specific options. */
#define SERIAL_USART_TX_PIN A9 // USART TX pin
/* Encoder Configuration */
#define ENCODER_DEFAULT_POS 0x3
-/* Disable RGB lighting when PC is in suspend */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
+// Needed as the master side could enter slave state during poweron
+// of host, due to missing VUSB detection.
+#define SPLIT_WATCHDOG_ENABLE
diff --git a/keyboards/keychron/q11/info.json b/keyboards/keychron/q11/info.json
index f240c70801..db70d2b7b6 100755
--- a/keyboards/keychron/q11/info.json
+++ b/keyboards/keychron/q11/info.json
@@ -11,6 +11,14 @@
"bootmagic": {
"matrix": [0, 1]
},
+ "dip_switch": {
+ "pins": ["A8"]
+ },
+ "eeprom": {
+ "wear_leveling": {
+ "backing_size": 4096
+ }
+ },
"features": {
"bootmagic": true,
"command": false,
@@ -36,6 +44,9 @@
]
}
},
+ "handedness": {
+ "matrix_grid": ["A2", "A15"]
+ },
"matrix_pins": {
"right": {
"cols": ["A8", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
@@ -84,7 +95,8 @@
"solid_reactive_multinexus": true,
"splash": true,
"solid_splash": true
- }
+ },
+ "sleep": true
},
"layouts": {
"LAYOUT_91_ansi": {
diff --git a/keyboards/keychron/q11/iso_encoder/config.h b/keyboards/keychron/q11/iso_encoder/config.h
index 57baea4c69..08632f0ce7 100755
--- a/keyboards/keychron/q11/iso_encoder/config.h
+++ b/keyboards/keychron/q11/iso_encoder/config.h
@@ -16,8 +16,5 @@
#pragma once
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 90
-
/* Enable caps-lock LED */
#define CAPS_LOCK_LED_INDEX 23
diff --git a/keyboards/keychron/q11/iso_encoder/iso_encoder.c b/keyboards/keychron/q11/iso_encoder/iso_encoder.c
index a2db569710..8725598b1c 100755
--- a/keyboards/keychron/q11/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q11/iso_encoder/iso_encoder.c
@@ -17,113 +17,113 @@
#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
/* Refer to SNLED27351 manual for these locations
* driver
* | R location
* | | G location
* | | | B location
* | | | | */
- {0, A_2, C_2, B_2}, // ESC
- {0, A_3, C_3, B_3}, // F1
- {0, A_4, C_4, B_4}, // F2
- {0, A_5, C_5, B_5}, // F3
- {0, A_6, C_6, B_6}, // F4
- {0, A_7, C_7, B_7}, // F5
- {0, A_8, C_8, B_8}, // F6
+ {0, CB1_CA2, CB3_CA2, CB2_CA2}, // ESC
+ {0, CB1_CA3, CB3_CA3, CB2_CA3}, // F1
+ {0, CB1_CA4, CB3_CA4, CB2_CA4}, // F2
+ {0, CB1_CA5, CB3_CA5, CB2_CA5}, // F3
+ {0, CB1_CA6, CB3_CA6, CB2_CA6}, // F4
+ {0, CB1_CA7, CB3_CA7, CB2_CA7}, // F5
+ {0, CB1_CA8, CB3_CA8, CB2_CA8}, // F6
- {0, D_1, F_1, E_1}, // M1
- {0, D_2, F_2, E_2}, // `~
- {0, D_3, F_3, E_3}, // 1!
- {0, D_4, F_4, E_4}, // 2@
- {0, D_5, F_5, E_5}, // 3#
- {0, D_6, F_6, E_6}, // 4$
- {0, D_7, F_7, E_7}, // 5%
- {0, D_8, F_8, E_8}, // 6^
+ {0, CB4_CA1, CB6_CA1, CB5_CA1}, // M1
+ {0, CB4_CA2, CB6_CA2, CB5_CA2}, // `~
+ {0, CB4_CA3, CB6_CA3, CB5_CA3}, // 1!
+ {0, CB4_CA4, CB6_CA4, CB5_CA4}, // 2@
+ {0, CB4_CA5, CB6_CA5, CB5_CA5}, // 3#
+ {0, CB4_CA6, CB6_CA6, CB5_CA6}, // 4$
+ {0, CB4_CA7, CB6_CA7, CB5_CA7}, // 5%
+ {0, CB4_CA8, CB6_CA8, CB5_CA8}, // 6^
- {0, G_1, I_1, H_1}, // M2
- {0, G_2, I_2, H_2}, // TAB
- {0, G_3, I_3, H_3}, // Q
- {0, G_4, I_4, H_4}, // W
- {0, G_5, I_5, H_5}, // E
- {0, G_6, I_6, H_6}, // R
- {0, G_7, I_7, H_7}, // T
+ {0, CB7_CA1, CB9_CA1, CB8_CA1}, // M2
+ {0, CB7_CA2, CB9_CA2, CB8_CA2}, // TAB
+ {0, CB7_CA3, CB9_CA3, CB8_CA3}, // Q
+ {0, CB7_CA4, CB9_CA4, CB8_CA4}, // W
+ {0, CB7_CA5, CB9_CA5, CB8_CA5}, // E
+ {0, CB7_CA6, CB9_CA6, CB8_CA6}, // R
+ {0, CB7_CA7, CB9_CA7, CB8_CA7}, // T
- {0, J_1, L_1, K_1}, // M3
- {0, J_2, L_2, K_2}, // CapsJock
- {0, J_3, L_3, K_3}, // A
- {0, J_4, L_4, K_4}, // S
- {0, J_5, L_5, K_5}, // D
- {0, J_6, L_6, K_6}, // F
- {0, J_7, L_7, K_7}, // G
+ {0, CB10_CA1, CB12_CA1, CB11_CA1}, // M3
+ {0, CB10_CA2, CB12_CA2, CB11_CA2}, // CapsJock
+ {0, CB10_CA3, CB12_CA3, CB11_CA3}, // A
+ {0, CB10_CA4, CB12_CA4, CB11_CA4}, // S
+ {0, CB10_CA5, CB12_CA5, CB11_CA5}, // D
+ {0, CB10_CA6, CB12_CA6, CB11_CA6}, // F
+ {0, CB10_CA7, CB12_CA7, CB11_CA7}, // G
- {0, J_9, L_9, K_9}, // M4
- {0, J_10, L_10, K_10}, // Shift_L
- {0, J_11, L_11, K_11}, // NUBS
- {0, J_12, L_12, K_12}, // Z
- {0, J_13, L_13, K_13}, // X
- {0, J_14, L_14, K_14}, // C
- {0, J_15, L_15, K_15}, // V
- {0, J_16, L_16, K_16}, // B
+ {0, CB10_CA9, CB12_CA9, CB11_CA9}, // M4
+ {0, CB10_CA10, CB12_CA10, CB11_CA10}, // Shift_L
+ {0, CB10_CA11, CB12_CA11, CB11_CA11}, // NUBS
+ {0, CB10_CA12, CB12_CA12, CB11_CA12}, // Z
+ {0, CB10_CA13, CB12_CA13, CB11_CA13}, // X
+ {0, CB10_CA14, CB12_CA14, CB11_CA14}, // C
+ {0, CB10_CA15, CB12_CA15, CB11_CA15}, // V
+ {0, CB10_CA16, CB12_CA16, CB11_CA16}, // B
- {0, G_9, I_9, H_9}, // M5
- {0, G_10, I_10, H_10}, // Ctrl_L
- {0, G_11, I_11, H_11}, // WGn_L
- {0, G_12, I_12, H_12}, // Alt_L
- {0, G_13, I_13, H_13}, // Fn
- {0, G_15, I_15, H_15}, // Space
+ {0, CB7_CA9, CB9_CA9, CB8_CA9}, // M5
+ {0, CB7_CA10, CB9_CA10, CB8_CA10}, // Ctrl_L
+ {0, CB7_CA11, CB9_CA11, CB8_CA11}, // WGn_L
+ {0, CB7_CA12, CB9_CA12, CB8_CA12}, // Alt_L
+ {0, CB7_CA13, CB9_CA13, CB8_CA13}, // Fn
+ {0, CB7_CA15, CB9_CA15, CB8_CA15}, // Space
- {0, A_16, C_16, B_16}, // F7
- {0, A_15, C_15, B_15}, // F8
- {0, A_14, C_14, B_14}, // F9
- {0, A_13, C_13, B_13}, // F11
- {0, A_12, C_12, B_12}, // F11
- {0, A_11, C_11, B_11}, // F12
- {0, A_10, C_10, B_10}, // INS
- {0, A_9, C_9, B_9}, // DEL
+ {0, CB1_CA16, CB3_CA16, CB2_CA16}, // F7
+ {0, CB1_CA15, CB3_CA15, CB2_CA15}, // F8
+ {0, CB1_CA14, CB3_CA14, CB2_CA14}, // F9
+ {0, CB1_CA13, CB3_CA13, CB2_CA13}, // F11
+ {0, CB1_CA12, CB3_CA12, CB2_CA12}, // F11
+ {0, CB1_CA11, CB3_CA11, CB2_CA11}, // F12
+ {0, CB1_CA10, CB3_CA10, CB2_CA10}, // INS
+ {0, CB1_CA9, CB3_CA9, CB2_CA9}, // DEL
- {0, D_16, F_16, E_16}, // 7&
- {0, D_15, F_15, E_15}, // 8*
- {0, D_14, F_14, E_14}, // 9(
- {0, D_13, F_13, E_13}, // 1)
- {0, D_12, F_12, E_12}, // -_
- {0, D_11, F_11, E_11}, // =+
- {0, D_10, F_10, E_10}, // BackSpace
- {0, D_8, F_8, E_8}, // PgUp
+ {0, CB4_CA16, CB6_CA16, CB5_CA16}, // 7&
+ {0, CB4_CA15, CB6_CA15, CB5_CA15}, // 8*
+ {0, CB4_CA14, CB6_CA14, CB5_CA14}, // 9(
+ {0, CB4_CA13, CB6_CA13, CB5_CA13}, // 1)
+ {0, CB4_CA12, CB6_CA12, CB5_CA12}, // -_
+ {0, CB4_CA11, CB6_CA11, CB5_CA11}, // =+
+ {0, CB4_CA10, CB6_CA10, CB5_CA10}, // BackSpace
+ {0, CB4_CA8, CB6_CA8, CB5_CA8}, // PgUp
- {0, G_16, I_16, H_16}, // Y
- {0, G_15, I_15, H_15}, // U
- {0, G_14, I_14, H_14}, // G
- {0, G_13, I_13, H_13}, // O
- {0, G_12, I_12, H_12}, // P
- {0, G_11, I_11, H_11}, // [
- {0, G_10, I_10, H_10}, // ]
- {0, G_8, I_8, H_8}, // PgDn
+ {0, CB7_CA16, CB9_CA16, CB8_CA16}, // Y
+ {0, CB7_CA15, CB9_CA15, CB8_CA15}, // U
+ {0, CB7_CA14, CB9_CA14, CB8_CA14}, // G
+ {0, CB7_CA13, CB9_CA13, CB8_CA13}, // O
+ {0, CB7_CA12, CB9_CA12, CB8_CA12}, // P
+ {0, CB7_CA11, CB9_CA11, CB8_CA11}, // [
+ {0, CB7_CA10, CB9_CA10, CB8_CA10}, // ]
+ {0, CB7_CA8, CB9_CA8, CB8_CA8}, // PgDn
- {0, J_16, L_16, K_16}, // H
- {0, J_15, L_15, K_15}, // J
- {0, J_14, L_14, K_14}, // KKEY_PRESS_HOME
- {0, J_13, L_13, K_13}, // J
- {0, J_12, L_12, K_12}, // ;:
- {0, J_11, L_11, K_11}, // '"
- {0, J_9, L_9, K_9}, // NUHS
- {0, G_9, I_9, H_9}, // Enter
- {0, J_8, L_8, K_8}, // Home
+ {0, CB10_CA16, CB12_CA16, CB11_CA16}, // H
+ {0, CB10_CA15, CB12_CA15, CB11_CA15}, // J
+ {0, CB10_CA14, CB12_CA14, CB11_CA14}, // KKEY_PRESS_HOME
+ {0, CB10_CA13, CB12_CA13, CB11_CA13}, // J
+ {0, CB10_CA12, CB12_CA12, CB11_CA12}, // ;:
+ {0, CB10_CA11, CB12_CA11, CB11_CA11}, // '"
+ {0, CB10_CA9, CB12_CA9, CB11_CA9}, // NUHS
+ {0, CB7_CA9, CB9_CA9, CB8_CA9}, // Enter
+ {0, CB10_CA8, CB12_CA8, CB11_CA8}, // Home
- {0, J_7, L_7, K_7}, // N
- {0, J_6, L_6, K_6}, // M
- {0, J_5, L_5, K_5}, // ,<
- {0, J_4, L_4, K_4}, // .>
- {0, J_3, L_3, K_3}, // ?/
- {0, J_2, L_2, K_2}, // Shift_R
- {0, J_1, L_1, K_1}, // Up
+ {0, CB10_CA7, CB12_CA7, CB11_CA7}, // N
+ {0, CB10_CA6, CB12_CA6, CB11_CA6}, // M
+ {0, CB10_CA5, CB12_CA5, CB11_CA5}, // ,<
+ {0, CB10_CA4, CB12_CA4, CB11_CA4}, // .>
+ {0, CB10_CA3, CB12_CA3, CB11_CA3}, // ?/
+ {0, CB10_CA2, CB12_CA2, CB11_CA2}, // Shift_R
+ {0, CB10_CA1, CB12_CA1, CB11_CA1}, // Up
- {0, G_6, I_6, H_6}, // Space
- {0, G_5, I_5, H_5}, // Win_R
- {0, G_4, I_4, H_4}, // Fn
- {0, G_3, I_3, H_3}, // Ctrl_R
- {0, G_2, I_2, H_2}, // Left
- {0, G_1, I_1, H_1}, // Down
- {0, G_7, I_7, H_7}, // Right
+ {0, CB7_CA6, CB9_CA6, CB8_CA6}, // Space
+ {0, CB7_CA5, CB9_CA5, CB8_CA5}, // Win_R
+ {0, CB7_CA4, CB9_CA4, CB8_CA4}, // Fn
+ {0, CB7_CA3, CB9_CA3, CB8_CA3}, // Ctrl_R
+ {0, CB7_CA2, CB9_CA2, CB8_CA2}, // Left
+ {0, CB7_CA1, CB9_CA1, CB8_CA1}, // Down
+ {0, CB7_CA7, CB9_CA7, CB8_CA7}, // Right
};
#endif
diff --git a/keyboards/keychron/q11/q11.c b/keyboards/keychron/q11/q11.c
index bf7bab4b53..f643113ea3 100755
--- a/keyboards/keychron/q11/q11.c
+++ b/keyboards/keychron/q11/q11.c
@@ -16,25 +16,6 @@
#include "quantum.h"
-// Mask out handedness diode to prevent it
-// from keeping the keyboard awake
-// - just mirroring `KC_NO` in the `LAYOUT`
-// macro to keep it simple
-const matrix_row_t matrix_mask[] = {
- 0b011111111,
- 0b011111111,
- 0b011011111,
- 0b001111111,
- 0b011111111,
- 0b001011111,
- 0b111111111,
- 0b101111111,
- 0b111111111,
- 0b110111111,
- 0b010111111,
- 0b111011110,
-};
-
#ifdef DIP_SWITCH_ENABLE
bool dip_switch_update_kb(uint8_t index, bool active) {
if (!dip_switch_update_user(index, active)) {