Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Add new board rev_0131 for Keychron Q0 #19547

Merged
merged 4 commits into from
Feb 2, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
44 changes: 15 additions & 29 deletions keyboards/keychron/q0/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,13 @@

#pragma once

/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 4

/* key matrix pins */
#define MATRIX_ROW_PINS { B5, B4, B3, A15, A14, A13 }
#define MATRIX_COL_PINS { A5, A6, A7, B0 }

/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION ROW2COL

/* Set 0 if debouncing isn't needed */
#define DEBOUNCE 5

/* RGB Matrix Driver Configuration */
#define DRIVER_COUNT 1
#define DRIVER_ADDR_1 0b1110100

#define CKLED2001_CURRENT_TUNE \
{ 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70 }

#define RGB_MATRIX_CENTER \
{ 56, 16 }
#define CKLED2001_CURRENT_TUNE { 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70 }

/* NKRO */
#define FORCE_NKRO
Expand All @@ -62,7 +46,7 @@
// #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_BAND_SPIRAL_VAL
#define ENABLE_RGB_MATRIX_CYCLE_ALL
#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
Expand All @@ -74,28 +58,30 @@
#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_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_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
// #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_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_MULTISPLASH
#define ENABLE_RGB_MATRIX_SOLID_SPLASH
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
// #define RGB_MATRIX_KEYPRESSES
// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH

#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
2 changes: 1 addition & 1 deletion keyboards/keychron/q0/q0.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include "q0.h"
#include "quantum.h"

#if defined(RGB_MATRIX_ENABLE) && defined(NUM_LOCK_LED_INDEX)

Expand Down
23 changes: 0 additions & 23 deletions keyboards/keychron/q0/q0.h

This file was deleted.

10 changes: 10 additions & 0 deletions keyboards/keychron/q0/rev_0130/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,19 @@

#pragma once

/* key matrix pins */
#define MATRIX_ROW_PINS { B5, B4, B3, A15, A14, A13 }
#define MATRIX_COL_PINS { A5, A6, A7, B0 }

/* RGB Matrix Driver Configuration */
#define DRIVER_COUNT 1
#define DRIVER_ADDR_1 0b1110100

/* RGB Matrix Configuration */
#define DRIVER_1_LED_TOTAL 21
#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL

#define RGB_MATRIX_CENTER { 56, 16 }

/* Enable num-lock LED */
#define NUM_LOCK_LED_INDEX 4
44 changes: 22 additions & 22 deletions keyboards/keychron/q0/rev_0130/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,33 +11,33 @@
"layouts": {
"LAYOUT_numpad_6x4": {
"layout": [
{"label":"Fn", "x":0, "y":0},
{"label":"Esc", "x":1, "y":0},
{"label":"Backspace", "x":2, "y":0},
{"label":"Tab", "x":3, "y":0},
{"matrix":[0,0], "x":0, "y":0},
{"matrix":[0,1], "x":1, "y":0},
{"matrix":[0,2], "x":2, "y":0},
{"matrix":[0,3], "x":3, "y":0},

{"label":"Num Lock", "x":0, "y":1},
{"label":"/", "x":1, "y":1},
{"label":"*", "x":2, "y":1},
{"label":"-", "x":3, "y":1},
{"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},

{"label":"7", "x":0, "y":2},
{"label":"8", "x":1, "y":2},
{"label":"9", "x":2, "y":2},
{"matrix":[2,0], "x":0, "y":2},
{"matrix":[2,1], "x":1, "y":2},
{"matrix":[2,2], "x":2, "y":2},

{"label":"4", "x":0, "y":3},
{"label":"5", "x":1, "y":3},
{"label":"6", "x":2, "y":3},
{"label":"+", "x":3, "y":2, "h":2},
{"matrix":[3,0], "x":0, "y":3},
{"matrix":[3,1], "x":1, "y":3},
{"matrix":[3,2], "x":2, "y":3},
{"matrix":[2,3], "x":3, "y":2, "h":2},

{"label":"1", "x":0, "y":4},
{"label":"2", "x":1, "y":4},
{"label":"3", "x":2, "y":4},
{"matrix":[4,0], "x":0, "y":4},
{"matrix":[4,1], "x":1, "y":4},
{"matrix":[4,2], "x":2, "y":4},

{"label":"0", "x":0, "y":5, "w":2},
{"label":".", "x":2, "y":5},
{"label":"Enter", "x":3, "y":4, "h":2}
{"matrix":[5,0], "x":0, "y":5, "w":2},
{"matrix":[5,2], "x":2, "y":5},
{"matrix":[4,3], "x":3, "y":4, "h":2}
]
}
}
}
}
65 changes: 65 additions & 0 deletions keyboards/keychron/q0/rev_0130/keymaps/keychron/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
/* Copyright 2023 @ 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 QMK_KEYBOARD_H
#include "keychron_common.h"

enum layers { _BASE, _FN1, _RESERVED1, _RESERVED2 };

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT_numpad_6x4(
MO(_FN1), KC_ESC, KC_BSPC, KC_TAB,
KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
KC_P7, KC_P8, KC_P9,
KC_P4, KC_P5, KC_P6, KC_PPLS,
KC_P1, KC_P2, KC_P3,
KC_P0, KC_PDOT, KC_PENT),

[_FN1] = LAYOUT_numpad_6x4(
_______, KC_MUTE, KC_VOLD, KC_VOLU,
RGB_MOD, RGB_VAI, RGB_HUI, KC_DEL,
RGB_RMOD, RGB_VAD, RGB_HUD,
RGB_SAI, RGB_SPI, KC_MPRV, _______,
RGB_SAD, RGB_SPD, KC_MPLY,
RGB_TOG, KC_MNXT, _______),

[_RESERVED1] = LAYOUT_numpad_6x4(
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______,
_______, _______, _______),

[_RESERVED2] = LAYOUT_numpad_6x4(
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______,
_______, _______, _______)
};

void housekeeping_task_user(void) {
housekeeping_task_keychron();
}

bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (!process_record_keychron(keycode, record)) {
return false;
}
return true;
}
5 changes: 5 additions & 0 deletions keyboards/keychron/q0/rev_0130/keymaps/keychron/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
VIA_ENABLE = yes
ENCODER_MAP_ENABLE = yes

VPATH += keyboards/keychron/common
SRC += keychron_common.c
38 changes: 0 additions & 38 deletions keyboards/keychron/q0/rev_0130/rev_0130.h

This file was deleted.

45 changes: 45 additions & 0 deletions keyboards/keychron/q0/rev_0131/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/* Copyright 2023 @ Keychron (https://www.keychron.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#pragma once

/* key matrix pins */
#define MATRIX_ROW_PINS { B5, B4, B3, A15, A14, A13 }
#define MATRIX_COL_PINS { C14, C15, A0, A1, A2 }

/* RGB Matrix Driver Configuration */
#define DRIVER_COUNT 1
#define DRIVER_ADDR_1 0b1110111

/* RGB Matrix Configuration */
#define DRIVER_1_LED_TOTAL 26
#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL

/* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in CKLED2001.h) */
#define PHASE_CHANNEL MSKPHASE_9CHANNEL

/* Enable num-lock LED */
#define NUM_LOCK_LED_INDEX 5

/* Encoder Configuration */
#define ENCODERS_PAD_A { A3 }
#define ENCODERS_PAD_B { A4 }
#define ENCODER_RESOLUTION 4
#define ENCODER_DEFAULT_POS 0x3

/* Specify (0,1) which programmed as "Fn" key on this keyboard as bootmagic key */
#define BOOTMAGIC_LITE_ROW 0
#define BOOTMAGIC_LITE_COLUMN 1
49 changes: 49 additions & 0 deletions keyboards/keychron/q0/rev_0131/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"keyboard_name": "Keychron Q0 Plus",
"manufacturer": "Keychron",
"url": "https://github.com/Keychron",
"maintainer": "lalalademaxiya1",
"usb": {
"vid": "0x3434",
"pid": "0x0131",
"device_version": "1.0.0"
},
KeychronMacro marked this conversation as resolved.
Show resolved Hide resolved
"layouts": {
"LAYOUT_numpad_6x5": {
"layout": [
{"matrix":[0,0], "x":0, "y":0},
{"matrix":[0,1], "x":1.25, "y":0},
{"matrix":[0,2], "x":2.25, "y":0},
{"matrix":[0,3], "x":3.25, "y":0},
{"matrix":[0,4], "x":4.25, "y":0},

{"matrix":[1,0], "x":0, "y":1.25},
{"matrix":[1,1], "x":1.25, "y":1.25},
{"matrix":[1,2], "x":2.25, "y":1.25},
{"matrix":[1,3], "x":3.25, "y":1.25},
{"matrix":[1,4], "x":4.25, "y":1.25},

{"matrix":[2,0], "x":0, "y":2.25},
{"matrix":[2,1], "x":1.25, "y":2.25},
{"matrix":[2,2], "x":2.25, "y":2.25},
{"matrix":[2,3], "x":3.25, "y":2.25},
{"matrix":[2,4], "x":4.25, "y":2.25, "h":2},

{"matrix":[3,0], "x":0, "y":3.25},
{"matrix":[3,1], "x":1.25, "y":3.25},
{"matrix":[3,2], "x":2.25, "y":3.25},
{"matrix":[3,3], "x":3.25, "y":3.25},

{"matrix":[4,0], "x":0, "y":4.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, "h":2},

{"matrix":[5,0], "x":0, "y":5.25},
{"matrix":[5,1], "x":1.25, "y":5.25, "w":2},
{"matrix":[5,3], "x":3.25, "y":5.25}
]
}
}
}
Loading