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.

Sign up for GitHub

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

Add keychron k6 rgb - ansi version to the updated structure #367

Draft
wants to merge 12 commits into
base: sn32_develop
Choose a base branch
from
Draft

Add keychron k6 rgb - ansi version to the updated structure #367

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c119ac3
[feat] Copy k2 to k6 without any modifications
uttarayan21 Nov 25, 2023
aa66dde
[feat] Move files in the k6 structure
uttarayan21 Nov 25, 2023
b034d82
[fix] Add keychron k6 sorta final
uttarayan21 Nov 26, 2023
2c2786a
[fix] Port the rgb matrix and the layout matrix from k2v2
uttarayan21 Nov 26, 2023
bb9cf6b
[fix] Remove k2v2 stuff from the k6
uttarayan21 Nov 26, 2023
0a7d3fb
[fix] Fix the keymap.c for via layout
uttarayan21 Nov 26, 2023
c2018f5
[fix] Add config.h for via
uttarayan21 Nov 26, 2023
876584e
[fix] Fix the via layout
uttarayan21 Nov 30, 2023
08dddbb
Merge remote-tracking branch 'sonix/sn32_develop' into sn32_develop_k6
uttarayan21 Jul 9, 2024
684375f
Merge branch 'SonixQMK:sn32_develop' into sn32_develop_k6
uttarayan21 Dec 18, 2024
4aeeabd
feat: Update keychron k6 to latest format
uttarayan21 Dec 18, 2024
af5791e
feat: Fix the pid for keychron k6
uttarayan21 Dec 18, 2024
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
17 changes: 17 additions & 0 deletions keyboards/keychron/k6/rgb/ansi/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/* Copyright 2023 Santanu Paik (https://github.com/itnerd69)
*
* 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/>.
*/

#define RGB_MATRIX_LED_COUNT 68
233 changes: 233 additions & 0 deletions keyboards/keychron/k6/rgb/ansi/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,233 @@
{
"keyboard_name": "Keychron K6 RGB ANSI",
"manufacturer": "Keychron",
"url": "https://www.keychron.com/products/keychron-k6-wireless-mechanical-keyboard",
"maintainer": "ITNerd69",
"usb": {
"pid": "0xFE0A",
"vid": "0x3434",
"device_version": "1.0.0"
},
"matrix_pins": {
"cols": ["A8", "A9", "A10", "A11", "A12", "A13", "A14", "A15", "B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"],
"rows": ["D11", "D10", "D9", "D8", "D7"]
},
"diode_direction": "COL2ROW",
"features": {
"rgb_matrix": true,
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": false,
"nkro": true,
"dip_switch": true
},
"processor": "SN32F248BF",
"bootloader": "sn32-dfu",
"debounce": 5,
"indicators": {
"caps_lock": "B9",
"on_state": 1
},
"layouts": {
"LAYOUT_ansi": {
"layout": [
{"matrix":[0, 0], "x":0, "y":0},
{"matrix":[0, 1], "x":1, "y":0},
{"matrix":[0, 2], "x":2, "y":0},
{"matrix":[0, 3], "x":3, "y":0},
{"matrix":[0, 4], "x":4, "y":0},
{"matrix":[0, 5], "x":5, "y":0},
{"matrix":[0, 6], "x":6, "y":0},
{"matrix":[0, 7], "x":7, "y":0},
{"matrix":[0, 8], "x":8, "y":0},
{"matrix":[0, 9], "x":9, "y":0},
{"matrix":[0, 10], "x":10, "y":0},
{"matrix":[0, 11], "x":11, "y":0},
{"matrix":[0, 12], "x":12, "y":0},
{"matrix":[0, 13], "x":13, "y":0, "w":2},
{"matrix":[0, 15], "x":15, "y":0},

{"matrix":[1, 0], "x":0, "y":1, "w":1.5},
{"matrix":[1, 1], "x":1.5, "y":1},
{"matrix":[1, 2], "x":2.5, "y":1},
{"matrix":[1, 3], "x":3.5, "y":1},
{"matrix":[1, 4], "x":4.5, "y":1},
{"matrix":[1, 5], "x":5.5, "y":1},
{"matrix":[1, 6], "x":6.5, "y":1},
{"matrix":[1, 7], "x":7.5, "y":1},
{"matrix":[1, 8], "x":8.5, "y":1},
{"matrix":[1, 9], "x":9.5, "y":1},
{"matrix":[1, 10], "x":10.5, "y":1},
{"matrix":[1, 11], "x":11.5, "y":1},
{"matrix":[1, 12], "x":12.5, "y":1},
{"matrix":[1, 13], "x":13.5, "y":1, "w":1.5},
{"matrix":[1, 15], "x":15, "y":1},

{"matrix":[2, 0], "x":0, "y":2, "w":1.75},
{"matrix":[2, 1], "x":1.75, "y":2},
{"matrix":[2, 2], "x":2.75, "y":2},
{"matrix":[2, 3], "x":3.75, "y":2},
{"matrix":[2, 4], "x":4.75, "y":2},
{"matrix":[2, 5], "x":5.75, "y":2},
{"matrix":[2, 6], "x":6.75, "y":2},
{"matrix":[2, 7], "x":7.75, "y":2},
{"matrix":[2, 8], "x":8.75, "y":2},
{"matrix":[2, 9], "x":9.75, "y":2},
{"matrix":[2, 10], "x":10.75, "y":2},
{"matrix":[2, 11], "x":11.75, "y":2},
{"matrix":[2, 13], "x":12.75, "y":2, "w":2.25},
{"matrix":[2, 15], "x":15, "y":2},

{"matrix":[3, 0], "x":0, "y":3, "w":2.25},
{"matrix":[3, 2], "x":2.25, "y":3},
{"matrix":[3, 3], "x":3.25, "y":3},
{"matrix":[3, 4], "x":4.25, "y":3},
{"matrix":[3, 5], "x":5.25, "y":3},
{"matrix":[3, 6], "x":6.25, "y":3},
{"matrix":[3, 7], "x":7.25, "y":3},
{"matrix":[3, 8], "x":8.25, "y":3},
{"matrix":[3, 9], "x":9.25, "y":3},
{"matrix":[3, 10], "x":10.25, "y":3},
{"matrix":[3, 11], "x":11.25, "y":3},
{"matrix":[3, 13], "x":12.25, "y":3, "w":1.75},
{"matrix":[3, 14], "x":14, "y":3},
{"matrix":[3, 15], "x":15, "y":3},

{"matrix":[4, 0], "x":0, "y":4, "w":1.25},
{"matrix":[4, 1], "x":1.25, "y":4, "w":1.25},
{"matrix":[4, 2], "x":2.5, "y":4, "w":1.25},
{"matrix":[4, 6], "x":3.75, "y":4, "w":6.25},
{"matrix":[4, 10], "x":10, "y":4},
{"matrix":[4, 11], "x":11, "y":4},
{"matrix":[4, 12], "x":12, "y":4},
{"matrix":[4, 13], "x":13, "y":4},
{"matrix":[4, 14], "x":14, "y":4},
{"matrix":[4, 15], "x":15, "y":4}
]
}
},
"rgb_matrix": {
"driver": "sn32f24xb",
"layout": [
{ "matrix": [ 0, 0 ], "flags": 4, "x": 0, "y": 0 },
{ "matrix": [ 0, 1 ], "flags": 4, "x": 12, "y": 0 },
{ "matrix": [ 0, 2 ], "flags": 4, "x": 25, "y": 0 },
{ "matrix": [ 0, 3 ], "flags": 4, "x": 37, "y": 0 },
{ "matrix": [ 0, 4 ], "flags": 4, "x": 50, "y": 0 },
{ "matrix": [ 0, 5 ], "flags": 4, "x": 62, "y": 0 },
{ "matrix": [ 0, 6 ], "flags": 4, "x": 75, "y": 0 },
{ "matrix": [ 0, 7 ], "flags": 4, "x": 87, "y": 0 },
{ "matrix": [ 0, 8 ], "flags": 4, "x": 100, "y": 0 },
{ "matrix": [ 0, 9 ], "flags": 4, "x": 112, "y": 0 },
{ "matrix": [ 0, 10 ], "flags": 4, "x": 124, "y": 0 },
{ "matrix": [ 0, 11 ], "flags": 4, "x": 137, "y": 0 },
{ "matrix": [ 0, 12 ], "flags": 4, "x": 149, "y": 0 },
{ "matrix": [ 0, 13 ], "flags": 4, "x": 168, "y": 0 },
{ "matrix": [ 0, 15 ], "flags": 4, "x": 187, "y": 0 },

{ "matrix": [ 1, 0 ], "flags": 4, "x": 3, "y": 16 },
{ "matrix": [ 1, 1 ], "flags": 4, "x": 19, "y": 16 },
{ "matrix": [ 1, 2 ], "flags": 4, "x": 31, "y": 16 },
{ "matrix": [ 1, 3 ], "flags": 4, "x": 44, "y": 16 },
{ "matrix": [ 1, 4 ], "flags": 4, "x": 56, "y": 16 },
{ "matrix": [ 1, 5 ], "flags": 4, "x": 68, "y": 16 },
{ "matrix": [ 1, 6 ], "flags": 4, "x": 81, "y": 16 },
{ "matrix": [ 1, 7 ], "flags": 4, "x": 93, "y": 16 },
{ "matrix": [ 1, 8 ], "flags": 4, "x": 106, "y": 16 },
{ "matrix": [ 1, 9 ], "flags": 4, "x": 118, "y": 16 },
{ "matrix": [ 1, 10 ], "flags": 4, "x": 131, "y": 16 },
{ "matrix": [ 1, 11 ], "flags": 4, "x": 143, "y": 16 },
{ "matrix": [ 1, 12 ], "flags": 4, "x": 156, "y": 16 },
{ "matrix": [ 1, 13 ], "flags": 4, "x": 168, "y": 16 },
{ "matrix": [ 1, 15 ], "flags": 4, "x": 187, "y": 16 },

{ "matrix": [ 2, 0 ], "flags": 4, "x": 5, "y": 32 },
{ "matrix": [ 2, 1 ], "flags": 4, "x": 22, "y": 32 },
{ "matrix": [ 2, 2 ], "flags": 4, "x": 34, "y": 32 },
{ "matrix": [ 2, 3 ], "flags": 4, "x": 47, "y": 32 },
{ "matrix": [ 2, 4 ], "flags": 4, "x": 59, "y": 32 },
{ "matrix": [ 2, 5 ], "flags": 4, "x": 72, "y": 32 },
{ "matrix": [ 2, 6 ], "flags": 4, "x": 84, "y": 32 },
{ "matrix": [ 2, 7 ], "flags": 4, "x": 96, "y": 32 },
{ "matrix": [ 2, 8 ], "flags": 4, "x": 109, "y": 32 },
{ "matrix": [ 2, 9 ], "flags": 4, "x": 121, "y": 32 },
{ "matrix": [ 2, 10 ], "flags": 4, "x": 134, "y": 32 },
{ "matrix": [ 2, 11 ], "flags": 4, "x": 146, "y": 32 },
{ "matrix": [ 2, 13 ], "flags": 4, "x": 166, "y": 32 },
{ "matrix": [ 2, 15 ], "flags": 4, "x": 187, "y": 32 },

{ "matrix": [ 3, 0 ], "flags": 4, "x": 8, "y": 48 },
{ "matrix": [ 3, 2 ], "flags": 4, "x": 28, "y": 48 },
{ "matrix": [ 3, 3 ], "flags": 4, "x": 40, "y": 48 },
{ "matrix": [ 3, 4 ], "flags": 4, "x": 53, "y": 48 },
{ "matrix": [ 3, 5 ], "flags": 4, "x": 65, "y": 48 },
{ "matrix": [ 3, 6 ], "flags": 4, "x": 78, "y": 48 },
{ "matrix": [ 3, 7 ], "flags": 4, "x": 90, "y": 48 },
{ "matrix": [ 3, 8 ], "flags": 4, "x": 103, "y": 48 },
{ "matrix": [ 3, 9 ], "flags": 4, "x": 115, "y": 48 },
{ "matrix": [ 3, 10 ], "flags": 4, "x": 128, "y": 48 },
{ "matrix": [ 3, 11 ], "flags": 4, "x": 140, "y": 48 },
{ "matrix": [ 3, 13 ], "flags": 4, "x": 157, "y": 48 },
{ "matrix": [ 3, 14 ], "flags": 4, "x": 174, "y": 48 },
{ "matrix": [ 3, 15 ], "flags": 4, "x": 187, "y": 48 },

{ "matrix": [ 4, 0 ], "flags": 4, "x": 2, "y": 64 },
{ "matrix": [ 4, 1 ], "flags": 4, "x": 17, "y": 64 },
{ "matrix": [ 4, 2 ], "flags": 4, "x": 33, "y": 64 },
{ "matrix": [ 4, 6 ], "flags": 4, "x": 79, "y": 64 },
{ "matrix": [ 4, 10 ], "flags": 4, "x": 124, "y": 64 },
{ "matrix": [ 4, 11 ], "flags": 4, "x": 137, "y": 64 },
{ "matrix": [ 4, 12 ], "flags": 4, "x": 149, "y": 64 },
{ "matrix": [ 4, 13 ], "flags": 4, "x": 162, "y": 64 },
{ "matrix": [ 4, 14 ], "flags": 4, "x": 174, "y": 64 },
{ "matrix": [ 4, 15 ], "flags": 4, "x": 187, "y": 64 }
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See https://github.com/SonixQMK/qmk_firmware/blob/sn32_develop/docs/feature_rgb_matrix.md#common-configuration-idcommon-configuration for the x,y coordinates

Copy link
Author

@uttarayan21 uttarayan21 Nov 30, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is what I was initially trying to use but I'm not exactly sure why the values cap out at 187 instead of 224
since
x = 224 / (NUMBER_OF_COLS - 1) * COL_POSITION
so last column should be
x = 224 / (16 - 1) * 15 = 224
But since k2v2 and k6 have same number of columns I'm not sure why It was 187

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there's a nifty tool to automate this kind of headache here https://xelus.netlify.app/guides/kle_to_rgb_parser

],
"animations": {
"alphas_mods" : true,
"band_pinwheel_sat" : true,
"band_pinwheel_val" : true,
"band_sat" : true,
"band_spiral_sat" : true,
"band_spiral_val" : true,
"band_val" : true,
"breathing" : true,
"cycle_all" : true,
"cycle_left_right" : true,
"cycle_out_in" : true,
"cycle_out_in_dual" : true,
"cycle_pinwheel" : true,
"cycle_spiral" : true,
"cycle_up_down" : true,
"digital_rain" : true,
"dual_beacon" : true,
"gradient_left_right" : true,
"gradient_up_down" : true,
"hue_breathing" : true,
"hue_pendulum" : true,
"hue_wave" : true,
"jellybean_raindrops" : true,
"multisplash" : true,
"pixel_flow" : true,
"pixel_fractal" : true,
"pixel_rain" : true,
"rainbow_beacon" : true,
"rainbow_moving_chevron" : true,
"rainbow_pinwheels" : true,
"raindrops" : true,
"solid_multisplash" : true,
"solid_reactive" : true,
"solid_reactive_cross" : true,
"solid_reactive_multicross" : true,
"solid_reactive_multinexus" : true,
"solid_reactive_multiwide" : true,
"solid_reactive_nexus" : true,
"solid_reactive_simple" : true,
"solid_reactive_wide" : true,
"solid_splash" : true,
"splash" : true,
"typing_heatmap" : true
}
}
}
Loading