gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-03-13 06:54:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into xap

Browse Source
This commit is contained in:
QMK Bot 2024-04-23 15:34:08 +00:00
commit 972c5f9d62
55 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
keyboards/keychron/c2_pro/ansi/rgb/info.json → keyboards/keychron/c2_pro/ansi/rgb/keyboard.json
View File

2
keyboards/keychron/c2_pro/ansi/rgb/rules.mk
View File

@ -1,2 +1,2 @@
# Build Options
# custom matrix setup
SRC += matrix.c

0
keyboards/keychron/c2_pro/ansi/white/info.json → keyboards/keychron/c2_pro/ansi/white/keyboard.json
View File

2
keyboards/keychron/c2_pro/ansi/white/rules.mk
View File

@ -1,2 +1,2 @@
# Build Options
# custom matrix setup
SRC += matrix.c

0
keyboards/keychron/q10/ansi_encoder/info.json → keyboards/keychron/q10/ansi_encoder/keyboard.json
View File

0
keyboards/keychron/q10/iso_encoder/info.json → keyboards/keychron/q10/iso_encoder/keyboard.json
View File

0
keyboards/keychron/q11/ansi_encoder/info.json → keyboards/keychron/q11/ansi_encoder/keyboard.json
View File

0
keyboards/keychron/q11/iso_encoder/info.json → keyboards/keychron/q11/iso_encoder/keyboard.json
View File

3
keyboards/keychron/q11/iso_encoder/rules.mk
View File

@ -1,4 +1 @@
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
SERIAL_DRIVER = usart

0
keyboards/keychron/q12/ansi_encoder/info.json → keyboards/keychron/q12/ansi_encoder/keyboard.json
View File

0
keyboards/keychron/q12/iso_encoder/info.json → keyboards/keychron/q12/iso_encoder/keyboard.json
View File

1
keyboards/keychron/q12/iso_encoder/rules.mk
View File

@ -1,5 +1,4 @@
# custom matrix setup
CUSTOM_MATRIX = lite
VPATH ?= keyboards/keychron/common
SRC += matrix.c

0
keyboards/keychron/q1v2/ansi/info.json → keyboards/keychron/q1v2/ansi/keyboard.json
View File

0
keyboards/keychron/q1v2/ansi_encoder/info.json → keyboards/keychron/q1v2/ansi_encoder/keyboard.json
View File

0
keyboards/keychron/q1v2/iso/info.json → keyboards/keychron/q1v2/iso/keyboard.json
View File

0
keyboards/keychron/q1v2/iso_encoder/info.json → keyboards/keychron/q1v2/iso_encoder/keyboard.json
View File

0
keyboards/keychron/q1v2/jis/info.json → keyboards/keychron/q1v2/jis/keyboard.json
View File

0
keyboards/keychron/q1v2/jis_encoder/info.json → keyboards/keychron/q1v2/jis_encoder/keyboard.json
View File

0
keyboards/keychron/q3/ansi_encoder/info.json → keyboards/keychron/q3/ansi_encoder/keyboard.json
View File

0
keyboards/keychron/q3/iso_encoder/info.json → keyboards/keychron/q3/iso_encoder/keyboard.json
View File

0
keyboards/keychron/q3/jis_encoder/info.json → keyboards/keychron/q3/jis_encoder/keyboard.json
View File

3
keyboards/keychron/q4/ansi/info.json
View File

@ -1,7 +1,6 @@
{
"usb": {
"pid": "0x0140",
"device_version": "1.0.6"
"pid": "0x0140"
},
"rgb_matrix": {
"layout": [

5
keyboards/keychron/q4/ansi/v1/keyboard.json Normal file
View File

@ -0,0 +1,5 @@
{
"usb": {
"device_version": "1.0.6"
}
}

1
keyboards/keychron/q4/ansi/v1/rules.mk
View File

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

5
keyboards/keychron/q4/ansi/v2/keyboard.json Normal file
View File

@ -0,0 +1,5 @@
{
"usb": {
"device_version": "2.0.0"
}
}

1
keyboards/keychron/q4/ansi/v2/rules.mk
View File

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

0
keyboards/keychron/q5/ansi/info.json → keyboards/keychron/q5/ansi/keyboard.json
View File

0
keyboards/keychron/q5/ansi_encoder/info.json → keyboards/keychron/q5/ansi_encoder/keyboard.json
View File

0
keyboards/keychron/q5/iso/info.json → keyboards/keychron/q5/iso/keyboard.json
View File

0
keyboards/keychron/q5/iso_encoder/info.json → keyboards/keychron/q5/iso_encoder/keyboard.json
View File

0
keyboards/keychron/q6/ansi/info.json → keyboards/keychron/q6/ansi/keyboard.json
View File

0
keyboards/keychron/q6/ansi_encoder/info.json → keyboards/keychron/q6/ansi_encoder/keyboard.json
View File

0
keyboards/keychron/q6/iso/info.json → keyboards/keychron/q6/iso/keyboard.json
View File

0
keyboards/keychron/q6/iso_encoder/info.json → keyboards/keychron/q6/iso_encoder/keyboard.json
View File

0
keyboards/keychron/q65/ansi_encoder/info.json → keyboards/keychron/q65/ansi_encoder/keyboard.json
View File

0
keyboards/keychron/v1/ansi/info.json → keyboards/keychron/v1/ansi/keyboard.json
View File

0
keyboards/keychron/v1/ansi_encoder/info.json → keyboards/keychron/v1/ansi_encoder/keyboard.json
View File

0
keyboards/keychron/v1/iso/info.json → keyboards/keychron/v1/iso/keyboard.json
View File

0
keyboards/keychron/v1/iso_encoder/info.json → keyboards/keychron/v1/iso_encoder/keyboard.json
View File

0
keyboards/keychron/v1/jis/info.json → keyboards/keychron/v1/jis/keyboard.json
View File

0
keyboards/keychron/v1/jis_encoder/info.json → keyboards/keychron/v1/jis_encoder/keyboard.json
View File

0
keyboards/keychron/v10/ansi_encoder/info.json → keyboards/keychron/v10/ansi_encoder/keyboard.json
View File

0
keyboards/keychron/v10/iso_encoder/info.json → keyboards/keychron/v10/iso_encoder/keyboard.json
View File

0
keyboards/keychron/v3/ansi_encoder/info.json → keyboards/keychron/v3/ansi_encoder/keyboard.json
View File

0
keyboards/keychron/v3/iso_encoder/info.json → keyboards/keychron/v3/iso_encoder/keyboard.json
View File

0
keyboards/keychron/v3/jis_encoder/info.json → keyboards/keychron/v3/jis_encoder/keyboard.json
View File

0
keyboards/keychron/v5/ansi/info.json → keyboards/keychron/v5/ansi/keyboard.json
View File

0
keyboards/keychron/v5/ansi_encoder/info.json → keyboards/keychron/v5/ansi_encoder/keyboard.json
View File

0
keyboards/keychron/v5/iso/info.json → keyboards/keychron/v5/iso/keyboard.json
View File

0
keyboards/keychron/v5/iso_encoder/info.json → keyboards/keychron/v5/iso_encoder/keyboard.json
View File

0
keyboards/keychron/v6/ansi/info.json → keyboards/keychron/v6/ansi/keyboard.json
View File

0
keyboards/keychron/v6/ansi_encoder/info.json → keyboards/keychron/v6/ansi_encoder/keyboard.json
View File

0
keyboards/keychron/v6/iso/info.json → keyboards/keychron/v6/iso/keyboard.json
View File

0
keyboards/keychron/v6/iso_encoder/info.json → keyboards/keychron/v6/iso_encoder/keyboard.json
View File

1
keyboards/keychron/v6/iso_encoder/rules.mk
View File

@ -1,5 +1,4 @@
# custom matrix setup
CUSTOM_MATRIX = lite
VPATH ?= keyboards/keychron/common
SRC += matrix.c