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

Update Q5 #22575

Merged
merged 9 commits into from
Feb 1, 2024
Merged

Update Q5 #22575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0e77c2a
Update Q5
adophoxia Nov 30, 2023
983743a
Update keyboards/keychron/q5/readme.md
adophoxia Nov 30, 2023
844a571
Update keyboards/keychron/q5/info.json
adophoxia Dec 1, 2023
ce41e0b
Merge branch 'develop' of https://github.com/qmk/qmk_firmware into up…
adophoxia Dec 1, 2023
31ba322
Run `qmk format-json` and remove `RGB_MATRIX_LED_COUNT`
adophoxia Dec 1, 2023
7006a74
Update keyboards/keychron/q5/ansi/info.json
adophoxia Dec 5, 2023
7b677a9
Update keyboards/keychron/q5/ansi_encoder/info.json
adophoxia Dec 5, 2023
cbbca99
Merge branch 'develop' into update-q5
adophoxia Jan 15, 2024
4a15bd5
Merge branch 'develop' into update-q5
adophoxia Jan 17, 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
32 changes: 0 additions & 32 deletions keyboards/keychron/q5/ansi/ansi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,36 +132,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
{1, L_7, J_7, K_7}
};

#define __ NO_LED

led_config_t g_led_config = {
{
// Key Matrix to LED Index
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 },
{ 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, __, 33, 34, 35 },
{ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 70, 51, 52, 53 },
{ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 18, 66, 36, 67, 68, 69 },
{ 71, __, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, __, 82, 83, 84, 85, 86 },
{ 87, 88, 89, __, __, 99, 90, __, __, __, 91, 92, 93, 94, 95, 96, 97, 98 }
},
{
// LED Index to Physical Position
{0,0}, {12,0}, {24,0}, {36,0}, {48,0}, {60,0}, {72,0}, {84,0}, {97,0}, {109,0}, {121,0}, {133,0}, {145,0}, {157,0}, {169,0}, {188,0}, {200,0}, {212,0}, {224,0},
{0,15}, {12,15}, {24,15}, {36,15}, {48,15}, {60,15}, {72,15}, {84,15}, {97,15}, {109,15}, {121,15}, {133,15}, {145,15}, {163,15}, {188,15}, {200,15}, {212,15}, {224,15},
{3,26}, {18,26}, {30,26}, {42,26}, {54,26}, {66,26}, {78,26}, {91,26}, {103,26}, {115,26}, {127,26}, {139,26}, {151,26}, {166,26}, {188,26}, {200,26}, {212,26},
{5,38}, {21,38}, {33,38}, {45,38}, {57,38}, {69,38}, {81,38}, {94,38}, {106,38}, {118,38}, {130,38}, {142,38}, {161,38}, {188,38}, {200,38}, {212,38}, {224,32},
{8,49}, {27,49}, {39,49}, {51,49}, {63,49}, {75,49}, {88,49}, {100,49}, {112,49}, {124,49}, {136,49}, {152,49}, {172,52}, {188,49}, {200,49}, {212,49},
{1,61}, {17,61}, {32,61}, {77,61}, {121,61}, {133,61}, {145,61}, {160,64}, {172,64}, {184,64}, {200,61}, {212,61}, {224,55},
},
{
// 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, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 8, 4, 4, 4,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 4, 4, 4, 4,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
}
};

#endif // RGB_MATRIX_ENABLE
7 changes: 1 addition & 6 deletions keyboards/keychron/q5/ansi/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,8 @@

#pragma once

/* RGB Matrix Configuration */
#define DRIVER_1_LED_TOTAL 55
#define DRIVER_2_LED_TOTAL 45
#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)

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

/* Enable num-lock LED */
// #define NUM_LOCK_LED_INDEX 33
#define NUM_LOCK_LED_INDEX 33
121 changes: 107 additions & 14 deletions keyboards/keychron/q5/ansi/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,112 @@
{
"keyboard_name": "Keychron Q5",
"manufacturer": "Keychron",
"url": "https://github.com/Keychron",
"maintainer": "lalalademaxiya1",
"usb": {
"vid": "0x3434",
"pid": "0x0150",
"device_version": "1.0.0"
},
"rgb_matrix": {
"driver": "snled27351"
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
{"matrix": [0, 1], "x": 12, "y": 0, "flags": 1},
{"matrix": [0, 2], "x": 24, "y": 0, "flags": 1},
{"matrix": [0, 3], "x": 36, "y": 0, "flags": 1},
{"matrix": [0, 4], "x": 48, "y": 0, "flags": 1},
{"matrix": [0, 5], "x": 60, "y": 0, "flags": 1},
{"matrix": [0, 6], "x": 72, "y": 0, "flags": 1},
{"matrix": [0, 7], "x": 84, "y": 0, "flags": 1},
{"matrix": [0, 8], "x": 97, "y": 0, "flags": 1},
{"matrix": [0, 9], "x": 109, "y": 0, "flags": 1},
{"matrix": [0, 10], "x": 121, "y": 0, "flags": 1},
{"matrix": [0, 11], "x": 133, "y": 0, "flags": 1},
{"matrix": [0, 12], "x": 145, "y": 0, "flags": 1},
{"matrix": [0, 13], "x": 157, "y": 0, "flags": 1},
{"matrix": [0, 14], "x": 169, "y": 0, "flags": 1},
{"matrix": [0, 15], "x": 188, "y": 0, "flags": 1},
{"matrix": [0, 16], "x": 200, "y": 0, "flags": 1},
{"matrix": [0, 17], "x": 212, "y": 0, "flags": 1},
{"matrix": [3, 12], "x": 224, "y": 0, "flags": 1},
{"matrix": [1, 0], "x": 0, "y": 15, "flags": 1},
{"matrix": [1, 1], "x": 12, "y": 15, "flags": 4},
{"matrix": [1, 2], "x": 24, "y": 15, "flags": 4},
{"matrix": [1, 3], "x": 36, "y": 15, "flags": 4},
{"matrix": [1, 4], "x": 48, "y": 15, "flags": 4},
{"matrix": [1, 5], "x": 60, "y": 15, "flags": 4},
{"matrix": [1, 6], "x": 72, "y": 15, "flags": 4},
{"matrix": [1, 7], "x": 84, "y": 15, "flags": 4},
{"matrix": [1, 8], "x": 97, "y": 15, "flags": 4},
{"matrix": [1, 9], "x": 109, "y": 15, "flags": 4},
{"matrix": [1, 10], "x": 121, "y": 15, "flags": 4},
{"matrix": [1, 11], "x": 133, "y": 15, "flags": 4},
{"matrix": [1, 12], "x": 145, "y": 15, "flags": 4},
{"matrix": [1, 13], "x": 163, "y": 15, "flags": 1},
{"matrix": [1, 15], "x": 188, "y": 15, "flags": 8},
{"matrix": [1, 16], "x": 200, "y": 15, "flags": 4},
{"matrix": [1, 17], "x": 212, "y": 15, "flags": 4},
{"matrix": [3, 14], "x": 224, "y": 15, "flags": 4},
{"matrix": [2, 0], "x": 3, "y": 26, "flags": 1},
{"matrix": [2, 1], "x": 18, "y": 26, "flags": 4},
{"matrix": [2, 2], "x": 30, "y": 26, "flags": 4},
{"matrix": [2, 3], "x": 42, "y": 26, "flags": 4},
{"matrix": [2, 4], "x": 54, "y": 26, "flags": 4},
{"matrix": [2, 5], "x": 66, "y": 26, "flags": 4},
{"matrix": [2, 6], "x": 78, "y": 26, "flags": 4},
{"matrix": [2, 7], "x": 91, "y": 26, "flags": 4},
{"matrix": [2, 8], "x": 103, "y": 26, "flags": 4},
{"matrix": [2, 9], "x": 115, "y": 26, "flags": 4},
{"matrix": [2, 10], "x": 127, "y": 26, "flags": 4},
{"matrix": [2, 11], "x": 139, "y": 26, "flags": 4},
{"matrix": [2, 12], "x": 151, "y": 26, "flags": 4},
{"matrix": [2, 13], "x": 166, "y": 26, "flags": 4},
{"matrix": [2, 15], "x": 188, "y": 26, "flags": 4},
{"matrix": [2, 16], "x": 200, "y": 26, "flags": 4},
{"matrix": [2, 17], "x": 212, "y": 26, "flags": 4},
{"matrix": [3, 0], "x": 5, "y": 38, "flags": 8},
{"matrix": [3, 1], "x": 21, "y": 38, "flags": 4},
{"matrix": [3, 2], "x": 33, "y": 38, "flags": 4},
{"matrix": [3, 3], "x": 45, "y": 38, "flags": 4},
{"matrix": [3, 4], "x": 57, "y": 38, "flags": 4},
{"matrix": [3, 5], "x": 69, "y": 38, "flags": 4},
{"matrix": [3, 6], "x": 81, "y": 38, "flags": 4},
{"matrix": [3, 7], "x": 94, "y": 38, "flags": 4},
{"matrix": [3, 8], "x": 106, "y": 38, "flags": 4},
{"matrix": [3, 9], "x": 118, "y": 38, "flags": 4},
{"matrix": [3, 10], "x": 130, "y": 38, "flags": 4},
{"matrix": [3, 11], "x": 142, "y": 38, "flags": 4},
{"matrix": [3, 13], "x": 161, "y": 38, "flags": 1},
{"matrix": [3, 15], "x": 188, "y": 38, "flags": 4},
{"matrix": [3, 16], "x": 200, "y": 38, "flags": 4},
{"matrix": [3, 17], "x": 212, "y": 38, "flags": 4},
{"matrix": [2, 14], "x": 224, "y": 32, "flags": 4},
{"matrix": [4, 0], "x": 8, "y": 49, "flags": 1},
{"matrix": [4, 2], "x": 27, "y": 49, "flags": 4},
{"matrix": [4, 3], "x": 39, "y": 49, "flags": 4},
{"matrix": [4, 4], "x": 51, "y": 49, "flags": 4},
{"matrix": [4, 5], "x": 63, "y": 49, "flags": 4},
{"matrix": [4, 6], "x": 75, "y": 49, "flags": 4},
{"matrix": [4, 7], "x": 88, "y": 49, "flags": 4},
{"matrix": [4, 8], "x": 100, "y": 49, "flags": 4},
{"matrix": [4, 9], "x": 112, "y": 49, "flags": 4},
{"matrix": [4, 10], "x": 124, "y": 49, "flags": 4},
{"matrix": [4, 11], "x": 136, "y": 49, "flags": 4},
{"matrix": [4, 13], "x": 152, "y": 49, "flags": 1},
{"matrix": [4, 14], "x": 172, "y": 52, "flags": 1},
{"matrix": [4, 15], "x": 188, "y": 49, "flags": 4},
{"matrix": [4, 16], "x": 200, "y": 49, "flags": 4},
{"matrix": [4, 17], "x": 212, "y": 49, "flags": 4},
{"matrix": [5, 0], "x": 1, "y": 61, "flags": 1},
{"matrix": [5, 1], "x": 17, "y": 61, "flags": 1},
{"matrix": [5, 2], "x": 32, "y": 61, "flags": 1},
{"matrix": [5, 6], "x": 77, "y": 61, "flags": 1},
{"matrix": [5, 10], "x": 121, "y": 61, "flags": 1},
{"matrix": [5, 11], "x": 133, "y": 61, "flags": 1},
{"matrix": [5, 12], "x": 145, "y": 61, "flags": 1},
{"matrix": [5, 13], "x": 160, "y": 64, "flags": 1},
{"matrix": [5, 14], "x": 172, "y": 64, "flags": 1},
{"matrix": [5, 15], "x": 184, "y": 64, "flags": 1},
{"matrix": [5, 16], "x": 200, "y": 61, "flags": 1},
{"matrix": [5, 17], "x": 212, "y": 61, "flags": 1},
{"matrix": [5, 5], "x": 224, "y": 55, "flags": 1}
]
},
"usb": {
"device_version": "1.0.0",
"pid": "0x0150"
},
"processor": "STM32L432",
"bootloader": "stm32-dfu",
"layouts": {
"LAYOUT_ansi_100": {
"layout": [
Expand Down Expand Up @@ -107,7 +201,6 @@
{"matrix": [4, 15], "x": 15.5, "y": 4.25},
{"matrix": [4, 16], "x": 16.5, "y": 4.25},
{"matrix": [4, 17], "x": 17.5, "y": 4.25},

{"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
{"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
{"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
Expand All @@ -124,4 +217,4 @@
]
}
}
}
}
17 changes: 1 addition & 16 deletions keyboards/keychron/q5/ansi/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
# 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 USB 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

# custom matrix setup
CUSTOM_MATRIX = lite

SRC += matrix.c
SRC += matrix.c
32 changes: 0 additions & 32 deletions keyboards/keychron/q5/ansi_encoder/ansi_encoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,36 +134,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
{1, L_7, J_7, K_7}
};

#define __ NO_LED

led_config_t g_led_config = {
{
// Key Matrix to LED Index
{ 0, __, 1, 2, 3, 4, __, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
{ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, __, 31, 32, 33 },
{ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 68, 49, 50, 51 },
{ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 16, 64, 34, 65, 66, 67 },
{ 69, __, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, __, 80, 81, 82, 83, 84 },
{ 85, 86, 87, __, __, 97, 88, __, __, __, 89, 90, 91, 92, 93, 94, 95, 96 }
},
{
// LED Index to Physical Position
{0,0}, {24,0}, {36,0}, {48,0}, {60,0}, {78,0}, {90,0}, {103,0}, {115,0}, {133,0}, {145,0}, {157,0}, {169,0}, {184,0}, {196,0}, {208,0}, {224,0},
{0,15}, {12,15}, {24,15}, {36,15}, {48,15}, {60,15}, {72,15}, {85,15}, {97,15}, {109,15}, {121,15}, {133,15}, {145,15}, {163,15}, {188,15}, {200,15}, {212,15}, {224,15},
{3,26}, {18,26}, {30,26}, {42,26}, {54,26}, {66,26}, {78,26}, {91,26}, {103,26}, {115,26}, {127,26}, {139,26}, {151,26}, {166,26}, {188,26}, {200,26}, {212,26},
{5,38}, {21,38}, {33,38}, {45,38}, {57,38}, {69,38}, {81,38}, {94,38}, {106,38}, {118,38}, {130,38}, {142,38}, {161,38}, {188,38}, {200,38}, {212,38}, {224,32},
{8,49}, {27,49}, {39,49}, {51,49}, {63,49}, {75,49}, {88,49}, {100,49}, {112,49}, {124,49}, {136,49}, {152,49}, {172,52}, {188,49}, {200,49}, {212,49},
{1,61}, {17,61}, {32,61}, {77,61}, {121,61}, {133,61}, {145,61}, {160,64}, {172,64}, {184,64}, {200,61}, {212,61}, {224,55},
},
{
// RGB LED Index to Flag
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, 8, 4, 4, 4,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 4, 4, 4, 4,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4,
1, 1, 1, 4, 1, 1, 1, 1, 1, 4, 4, 4, 1
}
};

#endif // RGB_MATRIX_ENABLE
10 changes: 1 addition & 9 deletions keyboards/keychron/q5/ansi_encoder/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,8 @@

#pragma once

/* RGB Matrix Configuration */
#define DRIVER_1_LED_TOTAL 53
#define DRIVER_2_LED_TOTAL 45
#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)

/* Encoder Configuration */
#define ENCODER_DEFAULT_POS 0x3

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

/* Enable num-lock LED */
// #define NUM_LOCK_LED_INDEX 31
#define NUM_LOCK_LED_INDEX 31
Loading