varl/qmk_firmware
1
0
Fork 0
forked from forks/qmk_firmware
Code Pull requests Activity

Update Keychron Q1v1 (#21993)

Browse source 
Co-authored-by: Drashna Jaelre <drashna@live.com>
This commit is contained in:
adophoxia 2023-10-03 20:53:39 -07:00 committed by GitHub
parent 6f59236b1f
commit 38f89dfc2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
104 changed files with 1044 additions and 802 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
data/mappings/keyboard_aliases.hjson
View file

@ -890,6 +890,9 @@
"kelowna/rgb64": {
"target": "weirdo/kelowna/rgb64"
},
"keychron/q1": {
"target": "keychron/q1v1"
}
"kprepublic/bm40hsrgb": {
"target": "kprepublic/bm40hsrgb/rev1"
},

115
keyboards/keychron/q1/ansi/info.json
View file

@ -1,115 +0,0 @@
{
"keyboard_name": "Q1",
"manufacturer": "Keychron",
"url": "https://github.com/Keychron",
"maintainer": "lalalademaxiya1",
"usb": {
"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": [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": [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": [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}
]
}
}
}

15
keyboards/keychron/q1/ansi/rules.mk
View file

@ -1,15 +0,0 @@
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
DIP_SWITCH_ENABLE = yes
RGB_MATRIX_ENABLE = yes
LTO_ENABLE = yes

120
keyboards/keychron/q1/ansi_encoder/info.json
View file

@ -1,120 +0,0 @@
{
"keyboard_name": "Q1",
"manufacturer": "Keychron",
"url": "https://github.com/Keychron",
"maintainer": "lalalademaxiya1",
"usb": {
"vid": "0x3434",
"pid": "0x0101",
"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"}
]
},
"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": [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": [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": [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}
]
}
}
}

16
keyboards/keychron/q1/ansi_encoder/rules.mk
View file

@ -1,16 +0,0 @@
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes # Enable Encoder
DIP_SWITCH_ENABLE = yes
RGB_MATRIX_ENABLE = yes
LTO_ENABLE = yes

80
keyboards/keychron/q1/config.h
View file

@ -1,80 +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
/* RGB Matrix Driver Configuration */
#define IS31FL3733_DRIVER_COUNT 2
#define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_GND
#define DRIVER_ADDR_2 IS31FL3733_I2C_ADDRESS_VCC_VCC
/* DIP switch */
#define DIP_SWITCH_MATRIX_GRID { {0,1} }
/* Disable DIP switch in matrix data */
#define MATRIX_MASKED
/* 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 ENABLE_RGB_MATRIX_ALPHAS_MODS
// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
#define ENABLE_RGB_MATRIX_BREATHING
// #define ENABLE_RGB_MATRIX_BAND_SAT
// #define ENABLE_RGB_MATRIX_BAND_VAL
// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
#define ENABLE_RGB_MATRIX_CYCLE_ALL
#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
#define ENABLE_RGB_MATRIX_DUAL_BEACON
#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
// #define ENABLE_RGB_MATRIX_RAINDROPS
#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
// #define ENABLE_RGB_MATRIX_HUE_BREATHING
// #define ENABLE_RGB_MATRIX_HUE_PENDULUM
// #define ENABLE_RGB_MATRIX_HUE_WAVE
#define ENABLE_RGB_MATRIX_PIXEL_RAIN
// #define ENABLE_RGB_MATRIX_PIXEL_FLOW
// #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
#define ENABLE_RGB_MATRIX_SPLASH
// #define ENABLE_RGB_MATRIX_MULTISPLASH
#define ENABLE_RGB_MATRIX_SOLID_SPLASH
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH

116
keyboards/keychron/q1/iso/info.json
View file

@ -1,116 +0,0 @@
{
"keyboard_name": "Q1",
"manufacturer": "Keychron",
"url": "https://github.com/Keychron",
"maintainer": "lalalademaxiya1",
"usb": {
"vid": "0x3434",
"pid": "0x0102",
"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": [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": [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": [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}
]
}
}
}

15
keyboards/keychron/q1/iso/rules.mk
View file

@ -1,15 +0,0 @@
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
DIP_SWITCH_ENABLE = yes
RGB_MATRIX_ENABLE = yes
LTO_ENABLE = yes

121
keyboards/keychron/q1/iso_encoder/info.json
View file

@ -1,121 +0,0 @@
{
"keyboard_name": "Keychron Q1",
"manufacturer": "Keychron",
"url": "https://github.com/Keychron",
"maintainer": "lalalademaxiya1",
"usb": {
"vid": "0x3434",
"pid": "0x0103",
"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"}
]
},
"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": [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": [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": [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}
]
}
}
}

18
keyboards/keychron/q1/iso_encoder/rules.mk
View file

@ -1,18 +0,0 @@
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes # Enable Encoder
DIP_SWITCH_ENABLE = yes
RGB_MATRIX_ENABLE = yes
RAW_ENABLE = yes
LTO_ENABLE = yes

38
keyboards/keychron/q1/q1.c
View file

@ -1,38 +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/>.
*/
#include "quantum.h"
const matrix_row_t matrix_mask[] = {
0b0111111111111101,
0b0111111111111111,
0b0111111111111111,
0b0111111111111111,
0b0111111111111111,
0b0111111111111111,
};
#ifdef DIP_SWITCH_ENABLE
bool dip_switch_update_kb(uint8_t index, bool active) {
if (!dip_switch_update_user(index, active)) { return false;}
if (index == 0) {
default_layer_set(1UL << (active ? 2 : 0));
}
return true;
}
#endif // DIP_SWITCH_ENABLE

21
keyboards/keychron/q1/readme.md
View file

@ -1,21 +0,0 @@
# Keychron Q1
![Keychron Q1](https://cdn.shopify.com/s/files/1/0059/0630/1017/t/5/assets/pf-823ebdc7--1073.jpg)
A customizable 75% keyboard.
* Keyboard Maintainer: [Keychron](https://github.com/keychron)
* Hardware Supported: Keychron Q1
* Hardware Availability: [Keychron](https://www.keychron.com)
Make example for this keyboard (after setting up your build environment):
make keychron/q1/ansi:default
Flashing example for this keyboard:
make keychron/q1/ansi:default:flash
**Reset Key**: Hold down the key located at *K00*, commonly programmed as *Esc* while plugging in the keyboard.
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

41
keyboards/keychron/q1/ansi_encoder/ansi_encoder.c → keyboards/keychron/q1v1/ansi/ansi.c
View file

@ -16,7 +16,17 @@
#include "quantum.h"
const matrix_row_t matrix_mask[] = {
0b0111111111111101,
0b0111111111111111,
0b0111111111111111,
0b0111111111111111,
0b0111111111111111,
0b0111111111111111,
};
#ifdef RGB_MATRIX_ENABLE
const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
/* Refer to IS31 manual for these locations
* driver
@ -111,38 +121,7 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
{1, F_14, D_14, E_14},
{1, F_15, D_15, E_15},
{1, F_16, D_16, E_16}
};
#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, 14 },
{ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 },
{ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44 },
{ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 71, 57, 58 },
{ 59, __, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 80, 70, 13 },
{ 72, 73, 74, __, __, __, 75, __, __, __, 76, 77, 78, 79, 81 }
},
{
// LED Index to Physical Position
{0,0}, {18,0}, {33,0}, {48,0}, {62,0}, {81,0}, {95,0}, {110,0}, {125,0}, {143,0}, {158,0}, {173,0}, {187,0}, {206,0}, {224,0},
{0,15}, {15,15}, {29,15}, {44,15}, {59,15}, {73,15}, {88,15}, {103,15}, {118,15}, {132,15}, {147,15}, {162,15}, {176,15}, {198,15}, {224,15},
{4,26}, {22,26}, {37,26}, {51,26}, {66,26}, {81,26}, {95,26}, {110,26}, {125,26}, {140,26}, {154,26}, {169,26}, {184,26}, {202,26}, {224,26},
{6,38}, {26,38}, {40,38}, {55,38}, {70,38}, {84,38}, {99,38}, {114,38}, {129,38}, {143,38}, {158,38}, {173,38}, {196,38}, {224,38},
{9,49}, {33,49}, {48,49}, {62,49}, {77,49}, {92,49}, {106,49}, {121,49}, {136,49}, {151,49}, {165,49}, {185,49}, {209,52},
{2,61}, {20,61}, {39,61}, {94,61}, {147,61}, {162,61}, {176,61}, {195,64}, {209,64}, {224,64}
},
{
// RGB LED Index to Flag
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, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
1, 1, 1, 4, 1, 1, 1, 1, 1, 1
}
};
#endif // RGB_MATRIX_ENABLE

7
keyboards/keychron/q1/ansi/config.h → keyboards/keychron/q1v1/ansi/config.h
View file

@ -17,6 +17,7 @@
#pragma once
/* RGB Matrix Configuration */
#define DRIVER_1_LED_TOTAL 59
#define DRIVER_2_LED_TOTAL 23
#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
#define RGB_MATRIX_LED_COUNT 82
/* Enable caps-lock LED */
#define CAPS_LOCK_LED_INDEX 45

190
keyboards/keychron/q1v1/ansi/info.json Normal file
View file

@ -0,0 +1,190 @@
{
"usb": {
"pid": "0x0100",
"device_version": "1.0.0"
},
"rgb_matrix": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
{"matrix": [0, 2], "x": 18, "y": 0, "flags": 1},
{"matrix": [0, 3], "x": 33, "y": 0, "flags": 1},
{"matrix": [0, 4], "x": 48, "y": 0, "flags": 1},
{"matrix": [0, 5], "x": 62, "y": 0, "flags": 1},
{"matrix": [0, 6], "x": 81, "y": 0, "flags": 1},
{"matrix": [0, 7], "x": 95, "y": 0, "flags": 1},
{"matrix": [0, 8], "x": 110, "y": 0, "flags": 1},
{"matrix": [0, 9], "x": 125, "y": 0, "flags": 1},
{"matrix": [0, 10], "x": 143, "y": 0, "flags": 1},
{"matrix": [0, 11], "x": 158, "y": 0, "flags": 1},
{"matrix": [0, 12], "x": 173, "y": 0, "flags": 1},
{"matrix": [0, 13], "x": 187, "y": 0, "flags": 1},
{"matrix": [4, 14], "x": 206, "y": 0, "flags": 1},
{"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
{"matrix": [1, 0], "x": 0, "y": 15, "flags": 1},
{"matrix": [1, 1], "x": 15, "y": 15, "flags": 4},
{"matrix": [1, 2], "x": 29, "y": 15, "flags": 4},
{"matrix": [1, 3], "x": 44, "y": 15, "flags": 4},
{"matrix": [1, 4], "x": 59, "y": 15, "flags": 4},
{"matrix": [1, 5], "x": 73, "y": 15, "flags": 4},
{"matrix": [1, 6], "x": 88, "y": 15, "flags": 4},
{"matrix": [1, 7], "x": 103, "y": 15, "flags": 4},
{"matrix": [1, 8], "x": 118, "y": 15, "flags": 4},
{"matrix": [1, 9], "x": 132, "y": 15, "flags": 4},
{"matrix": [1, 10], "x": 147, "y": 15, "flags": 4},
{"matrix": [1, 11], "x": 162, "y": 15, "flags": 4},
{"matrix": [1, 12], "x": 176, "y": 15, "flags": 4},
{"matrix": [1, 13], "x": 198, "y": 15, "flags": 1},
{"matrix": [1, 14], "x": 224, "y": 15, "flags": 1},
{"matrix": [2, 0], "x": 4, "y": 26, "flags": 1},
{"matrix": [2, 1], "x": 22, "y": 26, "flags": 4},
{"matrix": [2, 2], "x": 37, "y": 26, "flags": 4},
{"matrix": [2, 3], "x": 51, "y": 26, "flags": 4},
{"matrix": [2, 4], "x": 66, "y": 26, "flags": 4},
{"matrix": [2, 5], "x": 81, "y": 26, "flags": 4},
{"matrix": [2, 6], "x": 95, "y": 26, "flags": 4},
{"matrix": [2, 7], "x": 110, "y": 26, "flags": 4},
{"matrix": [2, 8], "x": 125, "y": 26, "flags": 4},
{"matrix": [2, 9], "x": 140, "y": 26, "flags": 4},
{"matrix": [2, 10], "x": 154, "y": 26, "flags": 4},
{"matrix": [2, 11], "x": 169, "y": 26, "flags": 4},
{"matrix": [2, 12], "x": 184, "y": 26, "flags": 4},
{"matrix": [2, 13], "x": 202, "y": 26, "flags": 4},
{"matrix": [2, 14], "x": 224, "y": 26, "flags": 1},
{"matrix": [3, 0], "x": 6, "y": 38, "flags": 1},
{"matrix": [3, 1], "x": 26, "y": 38, "flags": 4},
{"matrix": [3, 2], "x": 40, "y": 38, "flags": 4},
{"matrix": [3, 3], "x": 55, "y": 38, "flags": 4},
{"matrix": [3, 4], "x": 70, "y": 38, "flags": 4},
{"matrix": [3, 5], "x": 84, "y": 38, "flags": 4},
{"matrix": [3, 6], "x": 99, "y": 38, "flags": 4},
{"matrix": [3, 7], "x": 114, "y": 38, "flags": 4},
{"matrix": [3, 8], "x": 129, "y": 38, "flags": 4},
{"matrix": [3, 9], "x": 143, "y": 38, "flags": 4},
{"matrix": [3, 10], "x": 158, "y": 38, "flags": 4},
{"matrix": [3, 11], "x": 173, "y": 38, "flags": 4},
{"matrix": [3, 13], "x": 196, "y": 38, "flags": 1},
{"matrix": [3, 14], "x": 224, "y": 38, "flags": 1},
{"matrix": [4, 0], "x": 9, "y": 49, "flags": 1},
{"matrix": [4, 2], "x": 33, "y": 49, "flags": 4},
{"matrix": [4, 3], "x": 48, "y": 49, "flags": 4},
{"matrix": [4, 4], "x": 62, "y": 49, "flags": 4},
{"matrix": [4, 5], "x": 77, "y": 49, "flags": 4},
{"matrix": [4, 6], "x": 92, "y": 49, "flags": 4},
{"matrix": [4, 7], "x": 106, "y": 49, "flags": 4},
{"matrix": [4, 8], "x": 121, "y": 49, "flags": 4},
{"matrix": [4, 9], "x": 136, "y": 49, "flags": 4},
{"matrix": [4, 10], "x": 151, "y": 49, "flags": 4},
{"matrix": [4, 11], "x": 165, "y": 49, "flags": 4},
{"matrix": [4, 13], "x": 185, "y": 49, "flags": 1},
{"matrix": [3, 12], "x": 209, "y": 52, "flags": 1},
{"matrix": [5, 0], "x":2, "y": 61, "flags": 1},
{"matrix": [5, 1], "x":20, "y": 61, "flags": 1},
{"matrix": [5, 2], "x":39, "y": 61, "flags": 1},
{"matrix": [5, 6], "x":94, "y": 61, "flags": 4},
{"matrix": [5, 10], "x":147, "y": 61, "flags": 1},
{"matrix": [5, 11], "x":162, "y": 61, "flags": 1},
{"matrix": [5, 12], "x":176, "y": 61, "flags": 1},
{"matrix": [5, 13], "x":195, "y": 64, "flags": 1},
{"matrix": [4, 12], "x":209, "y": 64, "flags": 1},
{"matrix": [5, 14], "x":224, "y": 64, "flags": 1}
]
},
"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": [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": [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": [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}
]
}
}
}

0
keyboards/keychron/q1/ansi/keymaps/default/keymap.c → keyboards/keychron/q1v1/ansi/keymaps/default/keymap.c
View file

0
keyboards/keychron/q1/ansi/keymaps/gtg465x/README.md → keyboards/keychron/q1v1/ansi/keymaps/gtg465x/README.md
View file

0
keyboards/keychron/q1/ansi/keymaps/gtg465x/config.h → keyboards/keychron/q1v1/ansi/keymaps/gtg465x/config.h
View file

0
keyboards/keychron/q1/ansi/keymaps/gtg465x/keymap.c → keyboards/keychron/q1v1/ansi/keymaps/gtg465x/keymap.c
View file

0
keyboards/keychron/q1/ansi/keymaps/gtg465x/keymap_user.h → keyboards/keychron/q1v1/ansi/keymaps/gtg465x/keymap_user.h
View file

0
keyboards/keychron/q1/ansi/keymaps/gtg465x/rgb_matrix_user.c → keyboards/keychron/q1v1/ansi/keymaps/gtg465x/rgb_matrix_user.c
View file

0
keyboards/keychron/q1/ansi/keymaps/gtg465x/rgb_matrix_user.h → keyboards/keychron/q1v1/ansi/keymaps/gtg465x/rgb_matrix_user.h
View file

0
keyboards/keychron/q1/ansi/keymaps/gtg465x/rules.mk → keyboards/keychron/q1v1/ansi/keymaps/gtg465x/rules.mk
View file

0
keyboards/keychron/q1/ansi/keymaps/keychron/keymap.c → keyboards/keychron/q1v1/ansi/keymaps/keychron/keymap.c
View file

0
keyboards/keychron/q1/ansi/keymaps/keychron/rules.mk → keyboards/keychron/q1v1/ansi/keymaps/keychron/rules.mk
View file

0
keyboards/keychron/q1/ansi/keymaps/mkillewald/config.h → keyboards/keychron/q1v1/ansi/keymaps/mkillewald/config.h
View file

0
keyboards/keychron/q1/ansi/keymaps/mkillewald/keymap.c → keyboards/keychron/q1v1/ansi/keymaps/mkillewald/keymap.c
View file

0
keyboards/keychron/q1/ansi/keymaps/mkillewald/keymap_user.h → keyboards/keychron/q1v1/ansi/keymaps/mkillewald/keymap_user.h
View file

0
keyboards/keychron/q1/ansi/keymaps/mkillewald/readme.md → keyboards/keychron/q1v1/ansi/keymaps/mkillewald/readme.md
View file

0
keyboards/keychron/q1/ansi/keymaps/mkillewald/rgb_matrix_user.c → keyboards/keychron/q1v1/ansi/keymaps/mkillewald/rgb_matrix_user.c
View file

0
keyboards/keychron/q1/ansi/keymaps/mkillewald/rgb_matrix_user.h → keyboards/keychron/q1v1/ansi/keymaps/mkillewald/rgb_matrix_user.h
View file

0
keyboards/keychron/q1/ansi/keymaps/mkillewald/rules.mk → keyboards/keychron/q1v1/ansi/keymaps/mkillewald/rules.mk
View file

0
keyboards/keychron/q1/ansi/keymaps/teimor/config.h → keyboards/keychron/q1v1/ansi/keymaps/teimor/config.h
View file

0
keyboards/keychron/q1/ansi/keymaps/teimor/keymap.c → keyboards/keychron/q1v1/ansi/keymaps/teimor/keymap.c
View file

0
keyboards/keychron/q1/ansi/keymaps/teimor/keymap_user.h → keyboards/keychron/q1v1/ansi/keymaps/teimor/keymap_user.h
View file

0
keyboards/keychron/q1/ansi/keymaps/teimor/readme.md → keyboards/keychron/q1v1/ansi/keymaps/teimor/readme.md
View file

0
keyboards/keychron/q1/ansi/keymaps/teimor/rgb_matrix_user.c → keyboards/keychron/q1v1/ansi/keymaps/teimor/rgb_matrix_user.c
View file

0
keyboards/keychron/q1/ansi/keymaps/teimor/rgb_matrix_user.h → keyboards/keychron/q1v1/ansi/keymaps/teimor/rgb_matrix_user.h
View file

0
keyboards/keychron/q1/ansi/keymaps/teimor/rules.mk → keyboards/keychron/q1v1/ansi/keymaps/teimor/rules.mk
View file

0
keyboards/keychron/q1/ansi/keymaps/teimor/tap_dance_mac_caps.c → keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_mac_caps.c
View file

0
keyboards/keychron/q1/ansi/keymaps/teimor/tap_dance_mac_caps.h → keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_mac_caps.h
View file

0
keyboards/keychron/q1/ansi/keymaps/teimor/tap_dance_setup.c → keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_setup.c
View file

0
keyboards/keychron/q1/ansi/keymaps/teimor/tap_dance_setup.h → keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_setup.h
View file

0
keyboards/keychron/q1/ansi/keymaps/teimor/tap_dance_user.c → keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_user.c
View file

0
keyboards/keychron/q1/ansi/keymaps/teimor/tap_dance_win_caps.c → keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_win_caps.c
View file

0
keyboards/keychron/q1/ansi/keymaps/teimor/tap_dance_win_caps.h → keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_win_caps.h
View file

0
keyboards/keychron/q1/ansi/keymaps/via/keymap.c → keyboards/keychron/q1v1/ansi/keymaps/via/keymap.c
View file

0
keyboards/keychron/q1/ansi/keymaps/via/rules.mk → keyboards/keychron/q1v1/ansi/keymaps/via/rules.mk
View file

0
keyboards/keychron/q1/ansi/readme.md → keyboards/keychron/q1v1/ansi/readme.md
View file

1
keyboards/keychron/q1v1/ansi/rules.mk Normal file
View file

@ -0,0 +1 @@
# This file intentionally left blank

45
keyboards/keychron/q1/iso_encoder/iso_encoder.c → keyboards/keychron/q1v1/ansi_encoder/ansi_encoder.c
View file

@ -16,8 +16,16 @@
#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
const matrix_row_t matrix_mask[] = {
0b0111111111111101,
0b0111111111111111,
0b0111111111111111,
0b0111111111111111,
0b0111111111111111,
0b0111111111111111,
};
#ifdef RGB_MATRIX_ENABLE
const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
/* Refer to IS31 manual for these locations
* driver
@ -70,6 +78,7 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
{0, I_11, G_11, H_11},
{0, I_12, G_12, H_12},
{0, I_13, G_13, H_13},
{0, I_14, G_14, H_14},
{0, I_16, G_16, H_16},
{0, L_1, J_1, K_1},
@ -85,11 +94,9 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
{0, L_11, J_11, K_11},
{0, L_12, J_12, K_12},
{0, L_14, J_14, K_14},
{0, I_14, G_14, H_14},
{0, L_16, J_16, K_16},
{1, C_1, A_1, B_1},
{1, C_2, A_2, B_2},
{1, C_3, A_3, B_3},
{1, C_4, A_4, B_4},
{1, C_5, A_5, B_5},
@ -115,36 +122,4 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
{1, F_16, D_16, E_16}
};
#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, 14 },
{ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 },
{ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 57, 43 },
{ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 72, 56, 58 },
{ 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 81, 71, 13 },
{ 73, 74, 75, __, __, __, 76, __, __, __, 77, 78, 79, 80, 82 }
},
{
// LED Index to Physical Position
{0,0}, {18,0}, {33,0}, {48,0}, {62,0}, {81,0}, {95,0}, {110,0}, {125,0}, {143,0}, {158,0}, {173,0}, {187,0}, {206,0}, {224,0},
{0,15}, {15,15}, {29,15}, {44,15}, {59,15}, {73,15}, {88,15}, {103,15}, {118,15}, {132,15}, {147,15}, {162,15}, {176,15}, {198,15}, {224,15},
{4,26}, {22,26}, {37,26}, {51,26}, {66,26}, {81,26}, {95,26}, {110,26}, {125,26}, {140,26}, {154,26}, {169,26}, {184,26}, {224,26},
{6,38}, {26,38}, {40,38}, {55,38}, {70,38}, {84,38}, {99,38}, {114,38}, {129,38}, {143,38}, {158,38}, {173,38}, {187,38}, {203,32}, {224,38},
{2,49}, {18,49}, {33,49}, {48,49}, {62,49}, {77,49}, {92,49}, {106,49}, {121,49}, {136,49}, {151,49}, {165,49}, {185,49}, {209,52},
{2,61}, {20,61}, {39,61}, {94,61}, {147,61}, {162,61}, {176,61}, {195,64}, {209,64}, {224,64}
},
{
// RGB LED Index to Flag
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, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
9, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
1, 1, 1, 4, 1, 1, 1, 1, 1, 1
}
};
#endif // RGB_MATRIX_ENABLE

7
keyboards/keychron/q1/iso/config.h → keyboards/keychron/q1v1/ansi_encoder/config.h
View file

@ -17,6 +17,7 @@
#pragma once
/* RGB Matrix Configuration */
#define DRIVER_1_LED_TOTAL 59
#define DRIVER_2_LED_TOTAL 24
#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
#define RGB_MATRIX_LED_COUNT 82
/* Enable caps-lock LED */
#define CAPS_LOCK_LED_INDEX 45

196
keyboards/keychron/q1v1/ansi_encoder/info.json Normal file
View file

@ -0,0 +1,196 @@
{
"usb": {
"pid": "0x0101",
"device_version": "1.0.0"
},
"encoder": {
"enabled": true,
"rotary": [
{"pin_a": "E6", "pin_b": "B7"}
]
},
"rgb_matrix": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
{"matrix": [0, 2], "x": 18, "y": 0, "flags": 1},
{"matrix": [0, 3], "x": 33, "y": 0, "flags": 1},
{"matrix": [0, 4], "x": 48, "y": 0, "flags": 1},
{"matrix": [0, 5], "x": 62, "y": 0, "flags": 1},
{"matrix": [0, 6], "x": 81, "y": 0, "flags": 1},
{"matrix": [0, 7], "x": 95, "y": 0, "flags": 1},
{"matrix": [0, 8], "x": 110, "y": 0, "flags": 1},
{"matrix": [0, 9], "x": 125, "y": 0, "flags": 1},
{"matrix": [0, 10], "x": 143, "y": 0, "flags": 1},
{"matrix": [0, 11], "x": 158, "y": 0, "flags": 1},
{"matrix": [0, 12], "x": 173, "y": 0, "flags": 1},
{"matrix": [0, 13], "x": 187, "y": 0, "flags": 1},
{"matrix": [4, 14], "x": 206, "y": 0, "flags": 1},
{"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
{"matrix": [1, 0], "x": 0, "y": 15, "flags": 1},
{"matrix": [1, 1], "x": 15, "y": 15, "flags": 4},
{"matrix": [1, 2], "x": 29, "y": 15, "flags": 4},
{"matrix": [1, 3], "x": 44, "y": 15, "flags": 4},
{"matrix": [1, 4], "x": 59, "y": 15, "flags": 4},
{"matrix": [1, 5], "x": 73, "y": 15, "flags": 4},
{"matrix": [1, 6], "x": 88, "y": 15, "flags": 4},
{"matrix": [1, 7], "x": 103, "y": 15, "flags": 4},
{"matrix": [1, 8], "x": 118, "y": 15, "flags": 4},
{"matrix": [1, 9], "x": 132, "y": 15, "flags": 4},
{"matrix": [1, 10], "x": 147, "y": 15, "flags": 4},
{"matrix": [1, 11], "x": 162, "y": 15, "flags": 4},
{"matrix": [1, 12], "x": 176, "y": 15, "flags": 4},
{"matrix": [1, 13], "x": 198, "y": 15, "flags": 1},
{"matrix": [1, 14], "x": 224, "y": 15, "flags": 1},
{"matrix": [2, 0], "x": 4, "y": 26, "flags": 1},
{"matrix": [2, 1], "x": 22, "y": 26, "flags": 4},
{"matrix": [2, 2], "x": 37, "y": 26, "flags": 4},
{"matrix": [2, 3], "x": 51, "y": 26, "flags": 4},
{"matrix": [2, 4], "x": 66, "y": 26, "flags": 4},
{"matrix": [2, 5], "x": 81, "y": 26, "flags": 4},
{"matrix": [2, 6], "x": 95, "y": 26, "flags": 4},
{"matrix": [2, 7], "x": 110, "y": 26, "flags": 4},
{"matrix": [2, 8], "x": 125, "y": 26, "flags": 4},
{"matrix": [2, 9], "x": 140, "y": 26, "flags": 4},
{"matrix": [2, 10], "x": 154, "y": 26, "flags": 4},
{"matrix": [2, 11], "x": 169, "y": 26, "flags": 4},
{"matrix": [2, 12], "x": 184, "y": 26, "flags": 4},
{"matrix": [2, 13], "x": 202, "y": 26, "flags": 4},
{"matrix": [2, 14], "x": 224, "y": 26, "flags": 1},
{"matrix": [3, 0], "x": 6, "y": 38, "flags": 1},
{"matrix": [3, 1], "x": 26, "y": 38, "flags": 4},
{"matrix": [3, 2], "x": 40, "y": 38, "flags": 4},
{"matrix": [3, 3], "x": 55, "y": 38, "flags": 4},
{"matrix": [3, 4], "x": 70, "y": 38, "flags": 4},
{"matrix": [3, 5], "x": 84, "y": 38, "flags": 4},
{"matrix": [3, 6], "x": 99, "y": 38, "flags": 4},
{"matrix": [3, 7], "x": 114, "y": 38, "flags": 4},
{"matrix": [3, 8], "x": 129, "y": 38, "flags": 4},
{"matrix": [3, 9], "x": 143, "y": 38, "flags": 4},
{"matrix": [3, 10], "x": 158, "y": 38, "flags": 4},
{"matrix": [3, 11], "x": 173, "y": 38, "flags": 4},
{"matrix": [3, 13], "x": 196, "y": 38, "flags": 1},
{"matrix": [3, 14], "x": 224, "y": 38, "flags": 1},
{"matrix": [4, 0], "x": 9, "y": 49, "flags": 1},
{"matrix": [4, 2], "x": 33, "y": 49, "flags": 4},
{"matrix": [4, 3], "x": 48, "y": 49, "flags": 4},
{"matrix": [4, 4], "x": 62, "y": 49, "flags": 4},
{"matrix": [4, 5], "x": 77, "y": 49, "flags": 4},
{"matrix": [4, 6], "x": 92, "y": 49, "flags": 4},
{"matrix": [4, 7], "x": 106, "y": 49, "flags": 4},
{"matrix": [4, 8], "x": 121, "y": 49, "flags": 4},
{"matrix": [4, 9], "x": 136, "y": 49, "flags": 4},
{"matrix": [4, 10], "x": 151, "y": 49, "flags": 4},
{"matrix": [4, 11], "x": 165, "y": 49, "flags": 4},
{"matrix": [4, 13], "x": 185, "y": 49, "flags": 1},
{"matrix": [3, 12], "x": 209, "y": 52, "flags": 1},
{"matrix": [5, 0], "x":2, "y": 61, "flags": 1},
{"matrix": [5, 1], "x":20, "y": 61, "flags": 1},
{"matrix": [5, 2], "x":39, "y": 61, "flags": 1},
{"matrix": [5, 6], "x":94, "y": 61, "flags": 4},
{"matrix": [5, 10], "x":147, "y": 61, "flags": 1},
{"matrix": [5, 11], "x":162, "y": 61, "flags": 1},
{"matrix": [5, 12], "x":176, "y": 61, "flags": 1},
{"matrix": [5, 13], "x":195, "y": 64, "flags": 1},
{"matrix": [4, 12], "x":209, "y": 64, "flags": 1},
{"matrix": [5, 14], "x":224, "y": 64, "flags": 1}
]
},
"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": [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": [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": [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}
]
}
}
}

0
keyboards/keychron/q1/ansi_encoder/keymaps/default/keymap.c → keyboards/keychron/q1v1/ansi_encoder/keymaps/default/keymap.c
View file

0
keyboards/keychron/q1/ansi_encoder/keymaps/default/rules.mk → keyboards/keychron/q1v1/ansi_encoder/keymaps/default/rules.mk
View file

0
keyboards/keychron/q1/ansi_encoder/keymaps/keychron/keymap.c → keyboards/keychron/q1v1/ansi_encoder/keymaps/keychron/keymap.c
View file

0
keyboards/keychron/q1/ansi_encoder/keymaps/keychron/rules.mk → keyboards/keychron/q1v1/ansi_encoder/keymaps/keychron/rules.mk
View file

0
keyboards/keychron/q1/ansi_encoder/keymaps/via/keymap.c → keyboards/keychron/q1v1/ansi_encoder/keymaps/via/keymap.c
View file

0
keyboards/keychron/q1/ansi_encoder/keymaps/via/rules.mk → keyboards/keychron/q1v1/ansi_encoder/keymaps/via/rules.mk
View file

0
keyboards/keychron/q1/ansi_encoder/readme.md → keyboards/keychron/q1v1/ansi_encoder/readme.md
View file

1
keyboards/keychron/q1v1/ansi_encoder/rules.mk Normal file
View file

@ -0,0 +1 @@
# This file intentionally left blank

37
keyboards/keychron/q1v1/config.h Normal file
View file

@ -0,0 +1,37 @@
/* 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
/* RGB Matrix Driver Configuration */
#define IS31FL3733_DRIVER_COUNT 2
#define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_GND
#define DRIVER_ADDR_2 IS31FL3733_I2C_ADDRESS_GND_VCC
/* DIP switch */
#define DIP_SWITCH_MATRIX_GRID { {0,1} }
/* Disable DIP switch in matrix data */
#define MATRIX_MASKED
/* Encoder Configuration*/
#define ENCODER_DEFAULT_POS 0x3
/* Disable RGB lighting when PC is in suspend */
#define RGB_DISABLE_WHEN_USB_SUSPENDED
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS

54
keyboards/keychron/q1v1/info.json Normal file
View file

@ -0,0 +1,54 @@
{
"keyboard_name": "Keychron Q1v1",
"manufacturer": "Keychron",
"maintainer": "lalalademaxiya1",
"bootloader": "atmel-dfu",
"diode_direction": "ROW2COL",
"features": {
"bootmagic": true,
"command": false,
"console": false,
"dip_switch": true,
"extrakey": true,
"lto": true,
"mousekey": true,
"nkro": true,
"rgb_matrix": true
},
"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"]
},
"processor": "atmega32u4",
"rgb_matrix": {
"animations": {
"band_spiral_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,
"jellybean_raindrops": true,
"pixel_rain": true,
"rainbow_beacon": true,
"rainbow_moving_chevron": true,
"solid_reactive_multinexus": true,
"solid_reactive_multiwide": true,
"solid_reactive_simple": true,
"solid_splash": true,
"splash": true,
"typing_heatmap": true
},
"driver": "is31fl3733"
},
"url": "https://github.com/Keychron",
"usb": {
"force_nkro": true,
"vid": "0x3434"
}
}

7
keyboards/keychron/q1/ansi_encoder/config.h → keyboards/keychron/q1v1/iso/config.h
View file

@ -17,6 +17,7 @@
#pragma once
/* RGB Matrix Configuration */
#define DRIVER_1_LED_TOTAL 59
#define DRIVER_2_LED_TOTAL 23
#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
#define RGB_MATRIX_LED_COUNT 83
/* Enable caps-lock LED */
#define CAPS_LOCK_LED_INDEX 44

192
keyboards/keychron/q1v1/iso/info.json Normal file
View file

@ -0,0 +1,192 @@
{
"usb": {
"pid": "0x0102",
"device_version": "1.0.0"
},
"rgb_matrix": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
{"matrix": [0, 2], "x": 18, "y": 0, "flags": 1},
{"matrix": [0, 3], "x": 33, "y": 0, "flags": 1},
{"matrix": [0, 4], "x": 48, "y": 0, "flags": 1},
{"matrix": [0, 5], "x": 62, "y": 0, "flags": 1},
{"matrix": [0, 6], "x": 81, "y": 0, "flags": 1},
{"matrix": [0, 7], "x": 95, "y": 0, "flags": 1},
{"matrix": [0, 8], "x": 110, "y": 0, "flags": 1},
{"matrix": [0, 9], "x": 125, "y": 0, "flags": 1},
{"matrix": [0, 10], "x": 143, "y": 0, "flags": 1},
{"matrix": [0, 11], "x": 158, "y": 0, "flags": 1},
{"matrix": [0, 12], "x": 173, "y": 0, "flags": 1},
{"matrix": [0, 13], "x": 187, "y": 0, "flags": 1},
{"matrix": [4, 14], "x": 206, "y": 0, "flags": 1},
{"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
{"matrix": [1, 0], "x": 0, "y": 15, "flags": 1},
{"matrix": [1, 1], "x": 15, "y": 15, "flags": 4},
{"matrix": [1, 2], "x": 29, "y": 15, "flags": 4},
{"matrix": [1, 3], "x": 44, "y": 15, "flags": 4},
{"matrix": [1, 4], "x": 59, "y": 15, "flags": 4},
{"matrix": [1, 5], "x": 73, "y": 15, "flags": 4},
{"matrix": [1, 6], "x": 88, "y": 15, "flags": 4},
{"matrix": [1, 7], "x": 103, "y": 15, "flags": 4},
{"matrix": [1, 8], "x": 118, "y": 15, "flags": 4},
{"matrix": [1, 9], "x": 132, "y": 15, "flags": 4},
{"matrix": [1, 10], "x": 147, "y": 15, "flags": 4},
{"matrix": [1, 12], "x": 162, "y": 15, "flags": 4},
{"matrix": [1, 12], "x": 176, "y": 15, "flags": 4},
{"matrix": [1, 13], "x": 198, "y": 15, "flags": 1},
{"matrix": [1, 14], "x": 224, "y": 15, "flags": 1},
{"matrix": [2, 0], "x": 4, "y": 26, "flags": 1},
{"matrix": [2, 1], "x": 22, "y": 26, "flags": 4},
{"matrix": [2, 2], "x": 37, "y": 26, "flags": 4},
{"matrix": [2, 3], "x": 51, "y": 26, "flags": 4},
{"matrix": [2, 4], "x": 66, "y": 26, "flags": 4},
{"matrix": [2, 5], "x": 81, "y": 26, "flags": 4},
{"matrix": [2, 6], "x": 95, "y": 26, "flags": 4},
{"matrix": [2, 7], "x": 110, "y": 26, "flags": 4},
{"matrix": [2, 8], "x": 125, "y": 26, "flags": 4},
{"matrix": [2, 9], "x": 140, "y": 26, "flags": 4},
{"matrix": [2, 10], "x": 154, "y": 26, "flags": 4},
{"matrix": [2, 11], "x": 169, "y": 26, "flags": 4},
{"matrix": [2, 12], "x": 184, "y": 26, "flags": 4},
{"matrix": [2, 14], "x": 224, "y": 26, "flags": 1},
{"matrix": [3, 0], "x": 6, "y": 38, "flags": 1},
{"matrix": [3, 1], "x": 26, "y": 38, "flags": 4},
{"matrix": [3, 2], "x": 40, "y": 38, "flags": 4},
{"matrix": [3, 3], "x": 55, "y": 38, "flags": 4},
{"matrix": [3, 4], "x": 70, "y": 38, "flags": 4},
{"matrix": [3, 5], "x": 84, "y": 38, "flags": 4},
{"matrix": [3, 6], "x": 99, "y": 38, "flags": 4},
{"matrix": [3, 7], "x": 114, "y": 38, "flags": 4},
{"matrix": [3, 8], "x": 129, "y": 38, "flags": 4},
{"matrix": [3, 9], "x": 143, "y": 38, "flags": 4},
{"matrix": [3, 10], "x": 158, "y": 38, "flags": 4},
{"matrix": [3, 11], "x": 173, "y": 38, "flags": 4},
{"matrix": [3, 13], "x": 187, "y": 38, "flags": 4},
{"matrix": [2, 13], "x": 203, "y": 32, "flags": 1},
{"matrix": [3, 14], "x": 224, "y": 38, "flags": 1},
{"matrix": [4, 0], "x": 2, "y": 49, "flags": 1},
{"matrix": [4, 1], "x": 18, "y": 49, "flags": 4},
{"matrix": [4, 2], "x": 33, "y": 49, "flags": 4},
{"matrix": [4, 3], "x": 48, "y": 49, "flags": 4},
{"matrix": [4, 4], "x": 62, "y": 49, "flags": 4},
{"matrix": [4, 5], "x": 77, "y": 49, "flags": 4},
{"matrix": [4, 6], "x": 92, "y": 49, "flags": 4},
{"matrix": [4, 7], "x": 106, "y": 49, "flags": 4},
{"matrix": [4, 8], "x": 121, "y": 49, "flags": 4},
{"matrix": [4, 9], "x": 136, "y": 49, "flags": 4},
{"matrix": [4, 10], "x": 151, "y": 49, "flags": 4},
{"matrix": [4, 11], "x": 165, "y": 49, "flags": 4},
{"matrix": [4, 13], "x": 185, "y": 49, "flags": 1},
{"matrix": [3, 12], "x": 209, "y": 52, "flags": 1},
{"matrix": [5, 0], "x": 2, "y": 61, "flags": 1},
{"matrix": [5, 1], "x": 20, "y": 61, "flags": 1},
{"matrix": [5, 2], "x": 39, "y": 61, "flags": 1},
{"matrix": [5, 6], "x": 94, "y": 61, "flags": 4},
{"matrix": [5, 10], "x": 147, "y": 61, "flags": 1},
{"matrix": [5, 11], "x": 162, "y": 61, "flags": 1},
{"matrix": [5, 12], "x": 176, "y": 61, "flags": 1},
{"matrix": [5, 13], "x": 195, "y": 64, "flags": 1},
{"matrix": [4, 12], "x": 209, "y": 64, "flags": 1},
{"matrix": [5, 14], "x": 224, "y": 64, "flags": 1}
]
},
"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": [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": [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": [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}
]
}
}
}

39
keyboards/keychron/q1/iso/iso.c → keyboards/keychron/q1v1/iso/iso.c
View file

@ -16,6 +16,15 @@
#include "quantum.h"
const matrix_row_t matrix_mask[] = {
0b0111111111111101,
0b0111111111111111,
0b0111111111111111,
0b0111111111111111,
0b0111111111111111,
0b0111111111111111,
};
#ifdef RGB_MATRIX_ENABLE
const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
/* Refer to IS31 manual for these locations
@ -118,31 +127,31 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
led_config_t g_led_config = {
{
// Key Matrix to LED Index
// Key Matrix to LED Index
{ 0, __, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14 },
{ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 },
{ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 57, 43 },
{ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 72, 56, 58 },
{ 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 81, 71, 13 },
{ 73, 74, 75, __, __, __, 76, __, __, __, 77, 78, 79, 80, 82 }
{ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44 },
{ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 71, 57, 58 },
{ 59, __, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 80, 70, 13 },
{ 72, 73, 74, __, __, __, 75, __, __, __, 76, 77, 78, 79, 81 }
},
{
// LED Index to Physical Position
{0,0}, {18,0}, {33,0}, {48,0}, {62,0}, {81,0}, {95,0}, {110,0}, {125,0}, {143,0}, {158,0}, {173,0}, {187,0}, {206,0}, {224,0},
{0,15}, {15,15}, {29,15}, {44,15}, {59,15}, {73,15}, {88,15}, {103,15}, {118,15}, {132,15}, {147,15}, {162,15}, {176,15}, {198,15}, {224,15},
{4,26}, {22,26}, {37,26}, {51,26}, {66,26}, {81,26}, {95,26}, {110,26}, {125,26}, {140,26}, {154,26}, {169,26}, {184,26}, {224,26},
{6,38}, {26,38}, {40,38}, {55,38}, {70,38}, {84,38}, {99,38}, {114,38}, {129,38}, {143,38}, {158,38}, {173,38}, {187,38}, {203,32}, {224,38},
{2,49}, {18,49}, {33,49}, {48,49}, {62,49}, {77,49}, {92,49}, {106,49}, {121,49}, {136,49}, {151,49}, {165,49}, {185,49}, {209,52},
{2,61}, {20,61}, {39,61}, {94,61}, {147,61}, {162,61}, {176,61}, {195,64}, {209,64}, {224,64}
},
{4,26}, {22,26}, {37,26}, {51,26}, {66,26}, {81,26}, {95,26}, {110,26}, {125,26}, {140,26}, {154,26}, {169,26}, {184,26}, {202,26}, {224,26},
{6,38}, {26,38}, {40,38}, {55,38}, {70,38}, {84,38}, {99,38}, {114,38}, {129,38}, {143,38}, {158,38}, {173,38}, {196,38}, {224,38},
{9,49}, {33,49}, {48,49}, {62,49}, {77,49}, {92,49}, {106,49}, {121,49}, {136,49}, {151,49}, {165,49}, {185,49}, {209,52},
{2,61}, {20,61}, {39,61}, {94,61}, {147,61}, {162,61}, {176,61}, {195,64}, {209,64}, {224,64}
},
{
// 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, 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, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
1, 1, 1, 4, 1, 1, 1, 1, 1, 1
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
1, 1, 1, 4, 1, 1, 1, 1, 1, 1
}
};

0
keyboards/keychron/q1/iso/keymaps/default/keymap.c → keyboards/keychron/q1v1/iso/keymaps/default/keymap.c
View file

0
keyboards/keychron/q1/iso/keymaps/keychron/keymap.c → keyboards/keychron/q1v1/iso/keymaps/keychron/keymap.c
View file

0
keyboards/keychron/q1/iso/keymaps/keychron/rules.mk → keyboards/keychron/q1v1/iso/keymaps/keychron/rules.mk
View file

0
keyboards/keychron/q1/iso/keymaps/kubahorak/README.md → keyboards/keychron/q1v1/iso/keymaps/kubahorak/README.md
View file

0
keyboards/keychron/q1/iso/keymaps/kubahorak/config.h → keyboards/keychron/q1v1/iso/keymaps/kubahorak/config.h
View file

0
keyboards/keychron/q1/iso/keymaps/kubahorak/keymap.c → keyboards/keychron/q1v1/iso/keymaps/kubahorak/keymap.c
View file

0
keyboards/keychron/q1/iso/keymaps/kubahorak/keymap_user.h → keyboards/keychron/q1v1/iso/keymaps/kubahorak/keymap_user.h
View file

0
keyboards/keychron/q1/iso/keymaps/kubahorak/rgb_matrix_user.c → keyboards/keychron/q1v1/iso/keymaps/kubahorak/rgb_matrix_user.c
View file

0
keyboards/keychron/q1/iso/keymaps/kubahorak/rgb_matrix_user.h → keyboards/keychron/q1v1/iso/keymaps/kubahorak/rgb_matrix_user.h
View file

0
keyboards/keychron/q1/iso/keymaps/kubahorak/rules.mk → keyboards/keychron/q1v1/iso/keymaps/kubahorak/rules.mk
View file

0
keyboards/keychron/q1/iso/keymaps/mkillewald_iso/config.h → keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/config.h
View file

0
keyboards/keychron/q1/iso/keymaps/mkillewald_iso/keymap.c → keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/keymap.c
View file

0
keyboards/keychron/q1/iso/keymaps/mkillewald_iso/keymap_user.h → keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/keymap_user.h
View file

0
keyboards/keychron/q1/iso/keymaps/mkillewald_iso/readme.md → keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/readme.md
View file

0
keyboards/keychron/q1/iso/keymaps/mkillewald_iso/rgb_matrix_user.c → keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/rgb_matrix_user.c
View file

0
keyboards/keychron/q1/iso/keymaps/mkillewald_iso/rgb_matrix_user.h → keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/rgb_matrix_user.h
View file

0
keyboards/keychron/q1/iso/keymaps/mkillewald_iso/rules.mk → keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/rules.mk
View file

0
keyboards/keychron/q1/iso/keymaps/via/keymap.c → keyboards/keychron/q1v1/iso/keymaps/via/keymap.c
View file

0
keyboards/keychron/q1/iso/keymaps/via/rules.mk → keyboards/keychron/q1v1/iso/keymaps/via/rules.mk
View file

0
keyboards/keychron/q1/iso/keymaps/victorsavu3/config.h → keyboards/keychron/q1v1/iso/keymaps/victorsavu3/config.h
View file

0
keyboards/keychron/q1/iso/keymaps/victorsavu3/keymap.c → keyboards/keychron/q1v1/iso/keymaps/victorsavu3/keymap.c
View file

0
keyboards/keychron/q1/iso/keymaps/victorsavu3/readme.md → keyboards/keychron/q1v1/iso/keymaps/victorsavu3/readme.md
View file

0
keyboards/keychron/q1/iso/keymaps/victorsavu3/rules.mk → keyboards/keychron/q1v1/iso/keymaps/victorsavu3/rules.mk
View file

0
keyboards/keychron/q1/iso/readme.md → keyboards/keychron/q1v1/iso/readme.md
View file

1
keyboards/keychron/q1v1/iso/rules.mk Normal file
View file

@ -0,0 +1 @@
# This file intentionally left blank

4
keyboards/keychron/q1/iso_encoder/config.h → keyboards/keychron/q1v1/iso_encoder/config.h
View file

@ -17,9 +17,7 @@
#pragma once
/* RGB Matrix Configuration */
#define DRIVER_1_LED_TOTAL 59
#define DRIVER_2_LED_TOTAL 24
#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
#define RGB_MATRIX_LED_COUNT 83
/* Enable caps-lock LED */
#define CAPS_LOCK_LED_INDEX 44

199
keyboards/keychron/q1v1/iso_encoder/info.json Normal file
View file

@ -0,0 +1,199 @@
{
"usb": {
"pid": "0x0103",
"device_version": "1.0.2"
},
"diode_direction": "ROW2COL",
"encoder": {
"enabled": true,
"rotary": [
{"pin_a": "E6", "pin_b": "B7"}
]
},
"rgb_matrix": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
{"matrix": [0, 2], "x": 18, "y": 0, "flags": 1},
{"matrix": [0, 3], "x": 33, "y": 0, "flags": 1},
{"matrix": [0, 4], "x": 48, "y": 0, "flags": 1},
{"matrix": [0, 5], "x": 62, "y": 0, "flags": 1},
{"matrix": [0, 6], "x": 81, "y": 0, "flags": 1},
{"matrix": [0, 7], "x": 95, "y": 0, "flags": 1},
{"matrix": [0, 8], "x": 110, "y": 0, "flags": 1},
{"matrix": [0, 9], "x": 125, "y": 0, "flags": 1},
{"matrix": [0, 10], "x": 143, "y": 0, "flags": 1},
{"matrix": [0, 11], "x": 158, "y": 0, "flags": 1},
{"matrix": [0, 12], "x": 173, "y": 0, "flags": 1},
{"matrix": [0, 13], "x": 187, "y": 0, "flags": 1},
{"matrix": [4, 14], "x": 206, "y": 0, "flags": 1},
{"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
{"matrix": [1, 0], "x": 0, "y": 15, "flags": 1},
{"matrix": [1, 1], "x": 15, "y": 15, "flags": 4},
{"matrix": [1, 2], "x": 29, "y": 15, "flags": 4},
{"matrix": [1, 3], "x": 44, "y": 15, "flags": 4},
{"matrix": [1, 4], "x": 59, "y": 15, "flags": 4},
{"matrix": [1, 5], "x": 73, "y": 15, "flags": 4},
{"matrix": [1, 6], "x": 88, "y": 15, "flags": 4},
{"matrix": [1, 7], "x": 103, "y": 15, "flags": 4},
{"matrix": [1, 8], "x": 118, "y": 15, "flags": 4},
{"matrix": [1, 9], "x": 132, "y": 15, "flags": 4},
{"matrix": [1, 10], "x": 147, "y": 15, "flags": 4},
{"matrix": [1, 12], "x": 162, "y": 15, "flags": 4},
{"matrix": [1, 12], "x": 176, "y": 15, "flags": 4},
{"matrix": [1, 13], "x": 198, "y": 15, "flags": 1},
{"matrix": [1, 14], "x": 224, "y": 15, "flags": 1},
{"matrix": [2, 0], "x": 4, "y": 26, "flags": 1},
{"matrix": [2, 1], "x": 22, "y": 26, "flags": 4},
{"matrix": [2, 2], "x": 37, "y": 26, "flags": 4},
{"matrix": [2, 3], "x": 51, "y": 26, "flags": 4},
{"matrix": [2, 4], "x": 66, "y": 26, "flags": 4},
{"matrix": [2, 5], "x": 81, "y": 26, "flags": 4},
{"matrix": [2, 6], "x": 95, "y": 26, "flags": 4},
{"matrix": [2, 7], "x": 110, "y": 26, "flags": 4},
{"matrix": [2, 8], "x": 125, "y": 26, "flags": 4},
{"matrix": [2, 9], "x": 140, "y": 26, "flags": 4},
{"matrix": [2, 10], "x": 154, "y": 26, "flags": 4},
{"matrix": [2, 11], "x": 169, "y": 26, "flags": 4},
{"matrix": [2, 12], "x": 184, "y": 26, "flags": 4},
{"matrix": [2, 14], "x": 224, "y": 26, "flags": 1},
{"matrix": [3, 0], "x": 6, "y": 38, "flags": 1},
{"matrix": [3, 1], "x": 26, "y": 38, "flags": 4},
{"matrix": [3, 2], "x": 40, "y": 38, "flags": 4},
{"matrix": [3, 3], "x": 55, "y": 38, "flags": 4},
{"matrix": [3, 4], "x": 70, "y": 38, "flags": 4},
{"matrix": [3, 5], "x": 84, "y": 38, "flags": 4},
{"matrix": [3, 6], "x": 99, "y": 38, "flags": 4},
{"matrix": [3, 7], "x": 114, "y": 38, "flags": 4},
{"matrix": [3, 8], "x": 129, "y": 38, "flags": 4},
{"matrix": [3, 9], "x": 143, "y": 38, "flags": 4},
{"matrix": [3, 10], "x": 158, "y": 38, "flags": 4},
{"matrix": [3, 11], "x": 173, "y": 38, "flags": 4},
{"matrix": [3, 13], "x": 187, "y": 38, "flags": 4},
{"matrix": [2, 13], "x": 203, "y": 32, "flags": 1},
{"matrix": [3, 14], "x": 224, "y": 38, "flags": 1},
{"matrix": [4, 0], "x": 2, "y": 49, "flags": 1},
{"matrix": [4, 1], "x": 18, "y": 49, "flags": 4},
{"matrix": [4, 2], "x": 33, "y": 49, "flags": 4},
{"matrix": [4, 3], "x": 48, "y": 49, "flags": 4},
{"matrix": [4, 4], "x": 62, "y": 49, "flags": 4},
{"matrix": [4, 5], "x": 77, "y": 49, "flags": 4},
{"matrix": [4, 6], "x": 92, "y": 49, "flags": 4},
{"matrix": [4, 7], "x": 106, "y": 49, "flags": 4},
{"matrix": [4, 8], "x": 121, "y": 49, "flags": 4},
{"matrix": [4, 9], "x": 136, "y": 49, "flags": 4},
{"matrix": [4, 10], "x": 151, "y": 49, "flags": 4},
{"matrix": [4, 11], "x": 165, "y": 49, "flags": 4},
{"matrix": [4, 13], "x": 185, "y": 49, "flags": 1},
{"matrix": [3, 12], "x": 209, "y": 52, "flags": 1},
{"matrix": [5, 0], "x": 2, "y": 61, "flags": 1},
{"matrix": [5, 1], "x": 20, "y": 61, "flags": 1},
{"matrix": [5, 2], "x": 39, "y": 61, "flags": 1},
{"matrix": [5, 6], "x": 94, "y": 61, "flags": 4},
{"matrix": [5, 10], "x": 147, "y": 61, "flags": 1},
{"matrix": [5, 11], "x": 162, "y": 61, "flags": 1},
{"matrix": [5, 12], "x": 176, "y": 61, "flags": 1},
{"matrix": [5, 13], "x": 195, "y": 64, "flags": 1},
{"matrix": [4, 12], "x": 209, "y": 64, "flags": 1},
{"matrix": [5, 14], "x": 224, "y": 64, "flags": 1}
]
},
"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": [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": [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": [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}
]
}
}
}

45
keyboards/keychron/q1/ansi/ansi.c → keyboards/keychron/q1v1/iso_encoder/iso_encoder.c
View file

@ -16,6 +16,15 @@
#include "quantum.h"
const matrix_row_t matrix_mask[] = {
0b0111111111111101,
0b0111111111111111,
0b0111111111111111,
0b0111111111111111,
0b0111111111111111,
0b0111111111111111,
};
#ifdef RGB_MATRIX_ENABLE
const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
@ -70,7 +79,6 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
{0, I_11, G_11, H_11},
{0, I_12, G_12, H_12},
{0, I_13, G_13, H_13},
{0, I_14, G_14, H_14},
{0, I_16, G_16, H_16},
{0, L_1, J_1, K_1},
@ -86,9 +94,11 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
{0, L_11, J_11, K_11},
{0, L_12, J_12, K_12},
{0, L_14, J_14, K_14},
{0, I_14, G_14, H_14},
{0, L_16, J_16, K_16},
{1, C_1, A_1, B_1},
{1, C_2, A_2, B_2},
{1, C_3, A_3, B_3},
{1, C_4, A_4, B_4},
{1, C_5, A_5, B_5},
@ -112,39 +122,6 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
{1, F_14, D_14, E_14},
{1, F_15, D_15, E_15},
{1, F_16, D_16, E_16}
};
#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, 14 },
{ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 },
{ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44 },
{ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 71, 57, 58 },
{ 59, __, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 80, 70, 13 },
{ 72, 73, 74, __, __, __, 75, __, __, __, 76, 77, 78, 79, 81 }
},
{
// LED Index to Physical Position
{0,0}, {18,0}, {33,0}, {48,0}, {62,0}, {81,0}, {95,0}, {110,0}, {125,0}, {143,0}, {158,0}, {173,0}, {187,0}, {206,0}, {224,0},
{0,15}, {15,15}, {29,15}, {44,15}, {59,15}, {73,15}, {88,15}, {103,15}, {118,15}, {132,15}, {147,15}, {162,15}, {176,15}, {198,15}, {224,15},
{4,26}, {22,26}, {37,26}, {51,26}, {66,26}, {81,26}, {95,26}, {110,26}, {125,26}, {140,26}, {154,26}, {169,26}, {184,26}, {202,26}, {224,26},
{6,38}, {26,38}, {40,38}, {55,38}, {70,38}, {84,38}, {99,38}, {114,38}, {129,38}, {143,38}, {158,38}, {173,38}, {196,38}, {224,38},
{9,49}, {33,49}, {48,49}, {62,49}, {77,49}, {92,49}, {106,49}, {121,49}, {136,49}, {151,49}, {165,49}, {185,49}, {209,52},
{2,61}, {20,61}, {39,61}, {94,61}, {147,61}, {162,61}, {176,61}, {195,64}, {209,64}, {224,64}
},
{
// RGB LED Index to Flag
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, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
1, 1, 1, 4, 1, 1, 1, 1, 1, 1
}
};
#endif // RGB_MATRIX_ENABLE

0
keyboards/keychron/q1/iso_encoder/keymaps/default/keymap.c → keyboards/keychron/q1v1/iso_encoder/keymaps/default/keymap.c
View file

0
keyboards/keychron/q1/iso_encoder/keymaps/default/rules.mk → keyboards/keychron/q1v1/iso_encoder/keymaps/default/rules.mk
View file

0
keyboards/keychron/q1/iso_encoder/keymaps/keychron/keymap.c → keyboards/keychron/q1v1/iso_encoder/keymaps/keychron/keymap.c
View file

0
keyboards/keychron/q1/iso_encoder/keymaps/keychron/rules.mk → keyboards/keychron/q1v1/iso_encoder/keymaps/keychron/rules.mk
View file

0
keyboards/keychron/q1/iso_encoder/keymaps/via/keymap.c → keyboards/keychron/q1v1/iso_encoder/keymaps/via/keymap.c
View file

0
keyboards/keychron/q1/iso_encoder/keymaps/via/rules.mk → keyboards/keychron/q1v1/iso_encoder/keymaps/via/rules.mk
View file

Some files were not shown because too many files have changed in this diff Show more