Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Keychron q6 #18288

Merged
merged 40 commits into from
Nov 13, 2022
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
34b97f2
Add q6 for keychron
galican Sep 6, 2022
7e4d715
Update q6
galican Sep 6, 2022
1ba1bba
Update readme.md of q6
galican Sep 6, 2022
b15df5e
Upate mcuconf.h
galican Sep 6, 2022
8cc80bc
Update keyboards/keychron/q6/q6.c
KeychronMacro Sep 15, 2022
1c4df66
Update q6
galican Sep 15, 2022
2e21972
Merge branch 'keychron-q6' of https://github.com/Keychron/qmk_firmwar…
galican Sep 15, 2022
80102f8
Move matrix definitions into info.json
galican Sep 23, 2022
c3c7785
Merge branch 'temp' into keychron-q6
KeychronMacro Oct 13, 2022
cc7d5c9
Partial cleanup of Q6
KeychronMacro Oct 13, 2022
d451b42
Update q6.c
KeychronMacro Oct 25, 2022
c716aa8
Update keyboards/keychron/q6/ansi/keymaps/default/keymap.c
KeychronMacro Nov 12, 2022
59c12f8
Update keyboards/keychron/q6/ansi/keymaps/via/keymap.c
KeychronMacro Nov 12, 2022
0e994c0
Update keyboards/keychron/q6/ansi/keymaps/keychron/keymap.c
KeychronMacro Nov 12, 2022
420b68a
Update keyboards/keychron/q6/ansi/keymaps/default/keymap.c
KeychronMacro Nov 12, 2022
7facfe9
Update keyboards/keychron/q6/ansi/keymaps/keychron/keymap.c
KeychronMacro Nov 12, 2022
3b8ea18
Update keyboards/keychron/q6/ansi/keymaps/via/keymap.c
KeychronMacro Nov 12, 2022
5502e51
Update keyboards/keychron/q6/iso_encoder/keymaps/keychron/keymap.c
KeychronMacro Nov 12, 2022
daed868
Update keyboards/keychron/q6/ansi_encoder/keymaps/default/keymap.c
KeychronMacro Nov 12, 2022
0520129
Update keyboards/keychron/q6/iso_encoder/keymaps/via/keymap.c
KeychronMacro Nov 12, 2022
0eec72f
Update keyboards/keychron/q6/iso_encoder/keymaps/keychron/keymap.c
KeychronMacro Nov 12, 2022
c1cf59b
Update keyboards/keychron/q6/iso_encoder/rules.mk
KeychronMacro Nov 12, 2022
a48b56e
Update keyboards/keychron/q6/iso_encoder/keymaps/via/keymap.c
KeychronMacro Nov 12, 2022
999b96d
Update keyboards/keychron/q6/ansi_encoder/keymaps/default/keymap.c
KeychronMacro Nov 12, 2022
a44aa7e
Update keyboards/keychron/q6/readme.md
KeychronMacro Nov 12, 2022
962f92b
Update keyboards/keychron/q6/ansi_encoder/keymaps/keychron/keymap.c
KeychronMacro Nov 12, 2022
c713aa0
Update keyboards/keychron/q6/ansi_encoder/keymaps/keychron/keymap.c
KeychronMacro Nov 12, 2022
698d788
Update keyboards/keychron/q6/ansi_encoder/keymaps/via/keymap.c
KeychronMacro Nov 12, 2022
92e4d0c
Update keyboards/keychron/q6/ansi_encoder/keymaps/via/keymap.c
KeychronMacro Nov 12, 2022
b3a71d9
Update keyboards/keychron/q6/ansi_encoder/rules.mk
KeychronMacro Nov 12, 2022
44a557c
Update keyboards/keychron/q6/ansi/rules.mk
KeychronMacro Nov 12, 2022
759a953
Update keyboards/keychron/q6/iso/keymaps/default/keymap.c
KeychronMacro Nov 12, 2022
a16a718
Update keyboards/keychron/q6/iso_encoder/keymaps/default/keymap.c
KeychronMacro Nov 12, 2022
e8f3887
Update keyboards/keychron/q6/iso/keymaps/default/keymap.c
KeychronMacro Nov 12, 2022
1bb59a2
Update keyboards/keychron/q6/iso/keymaps/keychron/keymap.c
KeychronMacro Nov 12, 2022
1e2582a
Update keyboards/keychron/q6/iso/keymaps/keychron/keymap.c
KeychronMacro Nov 12, 2022
c372677
Update keyboards/keychron/q6/iso/keymaps/via/keymap.c
KeychronMacro Nov 12, 2022
0c45062
Update keyboards/keychron/q6/iso_encoder/keymaps/default/keymap.c
KeychronMacro Nov 12, 2022
a872548
Update keyboards/keychron/q6/iso/keymaps/via/keymap.c
KeychronMacro Nov 12, 2022
c7dc139
Update keyboards/keychron/q6/iso/rules.mk
KeychronMacro Nov 12, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
177 changes: 177 additions & 0 deletions keyboards/keychron/q6/ansi/ansi.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@
/* 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/>.
*/

#include "ansi.h"

#ifdef RGB_MATRIX_ENABLE

// clang-format off

const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations
* driver
* | R location
* | | G location
* | | | B location
* | | | | */
{0, I_1, G_1, H_1},
{0, I_2, G_2, H_2},
{0, I_3, G_3, H_3},
{0, I_4, G_4, H_4},
{0, I_5, G_5, H_5},
{0, I_6, G_6, H_6},
{0, I_7, G_7, H_7},
{0, I_8, G_8, H_8},
{0, I_9, G_9, H_9},
{0, I_10, G_10, H_10},
{0, I_11, G_11, H_11},
{0, I_12, G_12, H_12},
{0, I_13, G_13, H_13},
{0, I_15, G_15, H_15},
{0, I_16, G_16, H_16},
{0, L_5, J_5, K_5},
{0, L_6, J_6, K_6},
{0, L_7, J_7, K_7},
{0, L_8, J_8, K_8},
{0, L_4, J_4, K_4},

{0, C_1, A_1, B_1},
{0, C_2, A_2, B_2},
{0, C_3, A_3, B_3},
{0, C_4, A_4, B_4},
{0, C_5, A_5, B_5},
{0, C_6, A_6, B_6},
{0, C_7, A_7, B_7},
{0, C_8, A_8, B_8},
{0, C_9, A_9, B_9},
{0, C_10, A_10, B_10},
{0, C_11, A_11, B_11},
{0, C_12, A_12, B_12},
{0, C_13, A_13, B_13},
{0, C_14, A_14, B_14},
{0, C_15, A_15, B_15},
{0, C_16, A_16, B_16},
{0, L_9, J_9, K_9},
{0, L_10, J_10, K_10},
{0, L_11, J_11, K_11},
{0, L_12, J_12, K_12},
{0, L_13, J_13, K_13},

{0, F_1, D_1, E_1},
{0, F_2, D_2, E_2},
{0, F_3, D_3, E_3},
{0, F_4, D_4, E_4},
{0, F_5, D_5, E_5},
{0, F_6, D_6, E_6},
{0, F_7, D_7, E_7},
{0, F_8, D_8, E_8},
{0, F_9, D_9, E_9},
{0, F_10, D_10, E_10},
{0, F_11, D_11, E_11},
{0, F_12, D_12, E_12},
{0, F_13, D_13, E_13},
{0, F_14, D_14, E_14},
{0, F_15, D_15, E_15},
{0, F_16, D_16, E_16},
{0, L_14, J_14, K_14},
{0, L_15, J_15, K_15},
{0, L_16, J_16, K_16},
{1, L_1, J_1, K_1},

{1, C_16, A_16, B_16},
{1, C_15, A_15, B_15},
{1, C_14, A_14, B_14},
{1, C_13, A_13, B_13},
{1, C_12, A_12, B_12},
{1, C_11, A_11, B_11},
{1, C_10, A_10, B_10},
{1, C_9, A_9, B_9},
{1, C_8, A_8, B_8},
{1, C_7, A_7, B_7},
{1, C_6, A_6, B_6},
{1, C_5, A_5, B_5},
{1, C_3, A_3, B_3},
{1, L_3, J_3, K_3},
{1, L_4, J_4, K_4},
{1, L_5, J_5, K_5},
{1, L_2, J_2, K_2},

{1, I_16, G_16, H_16},
{1, I_14, G_14, H_14},
{1, I_13, G_13, H_13},
{1, I_12, G_12, H_12},
{1, I_11, G_11, H_11},
{1, I_10, G_10, H_10},
{1, I_9, G_9, H_9},
{1, I_8, G_8, H_8},
{1, I_7, G_7, H_7},
{1, I_6, G_6, H_6},
{1, I_5, G_5, H_5},
{1, I_3, G_3, H_3},
{1, I_1, G_1, H_1},
{1, L_6, J_6, K_6},
{1, L_7, J_7, K_7},
{1, L_8, J_8, K_8},

{1, F_16, D_16, E_16},
{1, F_15, D_15, E_15},
{1, F_14, D_14, E_14},
{1, F_10, D_10, E_10},
{1, F_6, D_6, E_6},
{1, F_5, D_5, E_5},
{1, F_4, D_4, E_4},
{1, F_3, D_3, E_3},
{1, F_2, D_2, E_2},
{1, F_1, D_1, E_1},
{1, L_10, J_10, K_10},
{1, L_11, J_11, K_11},
{1, L_12, J_12, K_12},
{1, L_9, J_9, K_9},
};

#define __ NO_LED

led_config_t g_led_config = {
{
// Key Matrix to LED Index
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, __, 13, 14, 15, 39, 40, 16 },
{ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 17 },
{ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 18 },
{ 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, __, 73, 60, 77, 76, 74, 75, 19 },
{ 78, __, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, __, 89, 93, 90, 107, 91, 92, __ },
{ 94, 95, 96, __, __, __, 97, __, __, __, 98, 99, 100, 101, 102, 103, 104, 105, 106, __ },
},
{
// LED Index to Physical Position
{0,0}, {21,0}, {31,0}, {42,0}, {52,0}, {68,0}, {78,0}, {89,0}, {99,0}, {115,0}, {125,0}, {136,0}, {146,0}, {159,0}, {169,0}, {180,0}, {193,0}, {203,0}, {214,0}, {224,0},
{0,15}, {10,15}, {21,15}, {31,15}, {42,15}, {52,15}, {63,15}, {73,15}, {83,15}, {94,15}, {104,15}, {115,15}, {125,15}, {141,15}, {159,15}, {169,15}, {180,15}, {193,15}, {203,15}, {214,15}, {224,15},
{3,27}, {16,27}, {26,27}, {36,27}, {47,27}, {57,27}, {68,27}, {78,27}, {89,27}, {99,27}, {109,27}, {120,27}, {130,27}, {143,27}, {159,27}, {169,27}, {180,27}, {193,27}, {203,27}, {214,27},
{4,40}, {18,40}, {29,40}, {39,40}, {50,40}, {60,40}, {70,40}, {81,40}, {91,40}, {102,40}, {112,40}, {123,40}, {139,40}, {193,40}, {203,40}, {214,40}, {224,34},
{7,52}, {23,52}, {34,52}, {44,52}, {55,52}, {65,52}, {76,52}, {86,52}, {96,52}, {107,52}, {117,52}, {137,52}, {169,52}, {193,52}, {203,52}, {214,52},
{1,64}, {14,64}, {27,64}, {66,64}, {105,64}, {118,64}, {131,64}, {145,64}, {159,64}, {169,64}, {180,64}, {198,64}, {214,64}, {224,58},
},
{
// RGB LED Index to Flag
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 8, 4, 4, 4,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 4, 4, 4,
8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 4, 4, 4, 4,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4,
1, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, 1, 4, 1,
}
};

#endif // RGB_MATRIX_ENABLE
19 changes: 19 additions & 0 deletions keyboards/keychron/q6/ansi/ansi.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/* 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"
36 changes: 36 additions & 0 deletions keyboards/keychron/q6/ansi/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/* 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

/* Key matrix pins */
#define MATRIX_ROW_PINS \
{ B5, B4, B3, A15, A14, A13 }
#define MATRIX_COL_PINS \
{ A10, A9, A8, B1, B0, A7, A6, A5, A4, A3, A2, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, C14 }
#define NO_PIN_START 11
#define NO_PIN_OFFSET 1

/* RGB Matrix Configuration */
#define DRIVER_1_LED_TOTAL 60
#define DRIVER_2_LED_TOTAL 48
#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)

/* Enable caps-lock LED*/
#define CAPS_LOCK_LED_INDEX 61

/* Enable NUM_LOCK_LED_INDEX */
// #define NUM_LOCK_LED_INDEX 37
130 changes: 130 additions & 0 deletions keyboards/keychron/q6/ansi/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
{
"keyboard_name": "Keychron Q6",
"manufacturer": "Keychron",
"url": "https://github.com/Keychron",
"maintainer": "lalalademaxiya1",
"usb": {
"vid": "0x3434",
"pid": "0x0160",
"device_version": "1.0.0"
},
"layouts": {
"LAYOUT_ansi_108": {
"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":[0,16], "x":17.25, "y":0},
{"matrix":[0,19], "x":18.5, "y":0},
{"matrix":[1,19], "x":19.5, "y":0},
{"matrix":[2,19], "x":20.5, "y":0},
{"matrix":[3,19], "x":21.5, "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":[1,16], "x":17.25, "y":1.25},
{"matrix":[1,17], "x":18.5, "y":1.25},
{"matrix":[1,18], "x":19.5, "y":1.25},
{"matrix":[0,17], "x":20.5, "y":1.25},
{"matrix":[0,18], "x":21.5, "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":[2,16], "x":17.25, "y":2.25},
{"matrix":[2,17], "x":18.5, "y":2.25},
{"matrix":[2,18], "x":19.5, "y":2.25},
{"matrix":[3,14], "x":20.5, "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,17], "x":18.5, "y":3.25},
{"matrix":[3,18], "x":19.5, "y":3.25},
{"matrix":[3,16], "x":20.5, "y":3.25},
{"matrix":[3,15], "x":21.5, "y":2.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,13], "x":12.25, "y":4.25, "w":2.75},
{"matrix":[4,15], "x":16.25, "y":4.25},
{"matrix":[4,17], "x":18.5, "y":4.25},
{"matrix":[4,18], "x":19.5, "y":4.25},
{"matrix":[4,14], "x":20.5, "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":[5,16], "x":17.25, "y":5.25},
{"matrix":[5,17], "x":18.5, "y":5.25, "w":2},
{"matrix":[5,18], "x":20.5, "y":5.25},
{"matrix":[4,16], "x":21.5, "y":4.25, "h":2}
]
}
}
}
Loading