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 Q7 #22577

Merged
merged 9 commits into from
Feb 1, 2024
Merged

Update Q7 #22577

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cb4c16d
Update Q7
adophoxia Nov 30, 2023
cb3fc40
Merge branch 'develop' of https://github.com/qmk/qmk_firmware into up…
adophoxia Dec 1, 2023
aee946f
Add missing `"wear_leveling": {` schema
adophoxia Dec 1, 2023
04f0020
Run `qmk format-json` and remove `RGB_MATRIX_LED_COUNT`
adophoxia Dec 1, 2023
ff6b696
Update keyboards/keychron/q7/ansi/info.json
adophoxia Dec 5, 2023
38beb98
Merge branch 'develop' of https://github.com/qmk/qmk_firmware into up…
adophoxia Jan 15, 2024
5d55e52
Merge branch 'update-q7' of https://github.com/adophoxia/qmk_firmware…
adophoxia Jan 15, 2024
93eb1fa
Put sleep in info.json
adophoxia Jan 15, 2024
2a932c2
Merge branch 'develop' into update-q7
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
29 changes: 0 additions & 29 deletions keyboards/keychron/q7/ansi/ansi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,33 +105,4 @@ const snled27351_led_t PROGMEM g_snled27351_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, 13, 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, 57, __, 58, 59, 60 },
{ 61, 62, 63, __, __, __, 64, __, __, 65, 66, 67, 68, 69, 70, 71 },
},
{
// LED Index to Physical Position
{0,0}, {14,0}, {28,0}, {42,0}, {56,0}, {70,0}, {84,0}, {98,0}, {112,0}, {126,0}, {140,0}, {154,0}, {168,0}, {189,0}, {210,0}, {224,0},
{4,16}, {21,16}, {35,16}, {49,16}, {63,16}, {77,16}, {91,16}, {105,16}, {119,16}, {133,16}, {147,16}, {161,16}, {175,16}, {192,16}, {210,16}, {224,16},
{5,32}, {25,32}, {38,32}, {52,32}, {66,32}, {80,32}, {94,32}, {108,32}, {122,32}, {136,32}, {150,32}, {164,32}, {187,32}, {210,32}, {224,32},
{9,48}, {32,48}, {45,48}, {59,48}, {73,48}, {87,48}, {101,48}, {115,48}, {129,48}, {143,48}, {157,48}, {184,48}, {210,48}, {224,48},
{2,64}, {19,64}, {37,64}, {89,64}, {140,64}, {154,64}, {168,64}, {182,64}, {196,64}, {210,64}, {224,64},
},
{
// RGB LED Index to Flag
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1,
1, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1,
}
};

#endif // RGB_MATRIX_ENABLE
5 changes: 0 additions & 5 deletions keyboards/keychron/q7/ansi/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,5 @@

#pragma once

/* RGB Matrix Configuration */
#define DRIVER_1_LED_TOTAL 37
#define DRIVER_2_LED_TOTAL 35
#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)

/* Enable caps-lock LED */
#define CAPS_LOCK_LED_INDEX 32
101 changes: 83 additions & 18 deletions keyboards/keychron/q7/ansi/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,88 @@
{
"keyboard_name": "Keychron Q7",
"manufacturer": "Keychron",
"url": "https://github.com/Keychron",
"maintainer": "lalalademaxiya1",
"usb": {
"vid": "0x3434",
"pid": "0x0170",
"device_version": "1.0.0"
},
"rgb_matrix": {
"driver": "snled27351"
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
{"matrix": [0, 1], "x": 14, "y": 0, "flags": 4},
{"matrix": [0, 2], "x": 28, "y": 0, "flags": 4},
{"matrix": [0, 3], "x": 42, "y": 0, "flags": 4},
{"matrix": [0, 4], "x": 56, "y": 0, "flags": 4},
{"matrix": [0, 5], "x": 70, "y": 0, "flags": 4},
{"matrix": [0, 6], "x": 84, "y": 0, "flags": 4},
{"matrix": [0, 7], "x": 98, "y": 0, "flags": 4},
{"matrix": [0, 8], "x": 112, "y": 0, "flags": 4},
{"matrix": [0, 9], "x": 126, "y": 0, "flags": 4},
{"matrix": [0, 10], "x": 140, "y": 0, "flags": 4},
{"matrix": [0, 11], "x": 154, "y": 0, "flags": 4},
{"matrix": [0, 12], "x": 168, "y": 0, "flags": 4},
{"matrix": [0, 13], "x": 189, "y": 0, "flags": 1},
{"matrix": [0, 14], "x": 210, "y": 0, "flags": 1},
{"matrix": [0, 15], "x": 224, "y": 0, "flags": 1},

{"matrix": [1, 0], "x": 4, "y": 16, "flags": 1},
{"matrix": [1, 1], "x": 21, "y": 16, "flags": 4},
{"matrix": [1, 2], "x": 35, "y": 16, "flags": 4},
{"matrix": [1, 3], "x": 49, "y": 16, "flags": 4},
{"matrix": [1, 4], "x": 63, "y": 16, "flags": 4},
{"matrix": [1, 5], "x": 77, "y": 16, "flags": 4},
{"matrix": [1, 6], "x": 91, "y": 16, "flags": 4},
{"matrix": [1, 7], "x": 105, "y": 16, "flags": 4},
{"matrix": [1, 8], "x": 119, "y": 16, "flags": 4},
{"matrix": [1, 9], "x": 133, "y": 16, "flags": 4},
{"matrix": [1, 10], "x": 147, "y": 16, "flags": 4},
{"matrix": [1, 11], "x": 161, "y": 16, "flags": 4},
{"matrix": [1, 12], "x": 175, "y": 16, "flags": 4},
{"matrix": [1, 13], "x": 192, "y": 16, "flags": 4},
{"matrix": [1, 14], "x": 210, "y": 16, "flags": 1},
{"matrix": [1, 15], "x": 224, "y": 16, "flags": 1},

{"matrix": [2, 0], "x": 5, "y": 32, "flags": 8},
{"matrix": [2, 1], "x": 25, "y": 32, "flags": 4},
{"matrix": [2, 2], "x": 38, "y": 32, "flags": 4},
{"matrix": [2, 3], "x": 52, "y": 32, "flags": 4},
{"matrix": [2, 4], "x": 66, "y": 32, "flags": 4},
{"matrix": [2, 5], "x": 80, "y": 32, "flags": 4},
{"matrix": [2, 6], "x": 94, "y": 32, "flags": 4},
{"matrix": [2, 7], "x": 108, "y": 32, "flags": 4},
{"matrix": [2, 8], "x": 122, "y": 32, "flags": 4},
{"matrix": [2, 9], "x": 136, "y": 32, "flags": 4},
{"matrix": [2, 10], "x": 150, "y": 32, "flags": 4},
{"matrix": [2, 11], "x": 164, "y": 32, "flags": 4},
{"matrix": [2, 13], "x": 187, "y": 32, "flags": 1},
{"matrix": [2, 14], "x": 210, "y": 32, "flags": 1},
{"matrix": [2, 15], "x": 224, "y": 32, "flags": 1},

{"matrix": [3, 0], "x": 9, "y": 48, "flags": 1},
{"matrix": [3, 2], "x": 32, "y": 48, "flags": 4},
{"matrix": [3, 3], "x": 45, "y": 48, "flags": 4},
{"matrix": [3, 4], "x": 59, "y": 48, "flags": 4},
{"matrix": [3, 5], "x": 73, "y": 48, "flags": 4},
{"matrix": [3, 6], "x": 87, "y": 48, "flags": 4},
{"matrix": [3, 7], "x": 101, "y": 48, "flags": 4},
{"matrix": [3, 8], "x": 115, "y": 48, "flags": 4},
{"matrix": [3, 9], "x": 129, "y": 48, "flags": 4},
{"matrix": [3, 10], "x": 143, "y": 48, "flags": 4},
{"matrix": [3, 11], "x": 157, "y": 48, "flags": 4},
{"matrix": [3, 13], "x": 184, "y": 48, "flags": 1},
{"matrix": [3, 14], "x": 210, "y": 48, "flags": 1},
{"matrix": [3, 15], "x": 224, "y": 48, "flags": 1},

{"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
{"matrix": [4, 1], "x": 19, "y": 64, "flags": 1},
{"matrix": [4, 2], "x": 37, "y": 64, "flags": 1},
{"matrix": [4, 6], "x": 89, "y": 64, "flags": 4},
{"matrix": [4, 9], "x": 140, "y": 64, "flags": 1},
{"matrix": [4, 10], "x": 154, "y": 64, "flags": 1},
{"matrix": [4, 11], "x": 168, "y": 64, "flags": 1},
{"matrix": [4, 12], "x": 182, "y": 64, "flags": 1},
{"matrix": [4, 13], "x": 196, "y": 64, "flags": 1},
{"matrix": [4, 14], "x": 210, "y": 64, "flags": 1},
{"matrix": [4, 15], "x": 224, "y": 64, "flags": 1}
]
},
"matrix_pins": {
"cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "B5"],
"rows": ["B4", "B3", "A15", "A14", "A13"]
"usb": {
"device_version": "1.0.0",
"pid": "0x0170"
},
"diode_direction": "ROW2COL",
"processor": "STM32L432",
"bootloader": "stm32-dfu",
"layouts": {
"LAYOUT_ansi_72": {
"layout": [
Expand Down Expand Up @@ -85,7 +150,7 @@
{"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
{"matrix": [3, 14], "x": 15, "y": 3},
{"matrix": [3, 15], "x": 16, "y": 3},

adophoxia marked this conversation as resolved.
Show resolved Hide resolved
{"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
Expand All @@ -100,4 +165,4 @@
]
}
}
}
}
15 changes: 1 addition & 14 deletions keyboards/keychron/q7/ansi/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1 @@
# 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
# This file intentionally left blank
60 changes: 1 addition & 59 deletions keyboards/keychron/q7/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,62 +38,4 @@
#define MATRIX_MASKED

/* turn off effects when suspended */
#define RGB_DISABLE_WHEN_USB_SUSPENDED

#define DYNAMIC_KEYMAP_LAYER_COUNT 5

/* EEPROM Driver Configuration */
#define WEAR_LEVELING_LOGICAL_SIZE 2048
#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)

// 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

#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_KEYPRESSES
#define RGB_DISABLE_WHEN_USB_SUSPENDED
60 changes: 60 additions & 0 deletions keyboards/keychron/q7/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
{
"manufacturer": "Keychron",
"keyboard_name": "Keychron Q7",
"maintainer": "lalalademaxiya1",
"bootloader": "stm32-dfu",
"diode_direction": "ROW2COL",
"dynamic_keymap": {
"layer_count": 5
},
"eeprom": {
"wear_leveling": {
"backing_size": 4096
}
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"dip_switch": true,
"extrakey": true,
"mousekey": true,
"nkro": true,
"rgb_matrix": true
},
"matrix_pins": {
"cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "B5"],
"rows": ["B4", "B3", "A15", "A14", "A13"]
},
"processor": "STM32L432",
"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": "snled27351"
},
"url": "https://github.com/Keychron",
"usb": {
"vid": "0x3434"
}
}
5 changes: 0 additions & 5 deletions keyboards/keychron/q7/iso/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,5 @@

#pragma once

/* RGB Matrix Configuration */
#define DRIVER_1_LED_TOTAL 37
#define DRIVER_2_LED_TOTAL 36
#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)

/* Enable caps-lock LED */
#define CAPS_LOCK_LED_INDEX 31
Loading