diff options
Diffstat (limited to 'keyboards/keychron')
29 files changed, 57 insertions, 54 deletions
diff --git a/keyboards/keychron/bluetooth/bluetooth.mk b/keyboards/keychron/bluetooth/bluetooth.mk index 70db522586..3a57a6d75d 100644 --- a/keyboards/keychron/bluetooth/bluetooth.mk +++ b/keyboards/keychron/bluetooth/bluetooth.mk @@ -1,3 +1,6 @@ + +OPT_DEFS += -DKC_BLUETOOTH_ENABLE + BLUETOOTH_DIR = bluetooth SRC += \ $(BLUETOOTH_DIR)/bluetooth.c \ diff --git a/keyboards/keychron/k10_pro/info.json b/keyboards/keychron/k10_pro/info.json index f17910af4c..8833cd1815 100644 --- a/keyboards/keychron/k10_pro/info.json +++ b/keyboards/keychron/k10_pro/info.json @@ -24,7 +24,8 @@ "matrix_pins": { "rows": ["B5", "B4", "B3", "A15", "A14", "A13"], "cols": ["B0", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], - "custom_lite": true + "custom": true, + "custom_lite": true }, "layouts": { "LAYOUT_ansi_108": { @@ -263,4 +264,4 @@ ] } } -}
\ No newline at end of file +} diff --git a/keyboards/keychron/k10_pro/rules.mk b/keyboards/keychron/k10_pro/rules.mk index 15ebea7eb8..8e536fc345 100644 --- a/keyboards/keychron/k10_pro/rules.mk +++ b/keyboards/keychron/k10_pro/rules.mk @@ -1,7 +1,6 @@ # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST -OPT_DEFS += -DKC_BLUETOOTH_ENABLE SRC += matrix.c diff --git a/keyboards/keychron/k13_pro/info.json b/keyboards/keychron/k13_pro/info.json index c76af8ed35..194963853d 100644 --- a/keyboards/keychron/k13_pro/info.json +++ b/keyboards/keychron/k13_pro/info.json @@ -24,7 +24,8 @@ "matrix_pins": { "rows": ["B5", "B4", "B3", "A15", "A14", "A13"], "cols": ["C15", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], - "custom_lite": true + "custom": true, + "custom_lite": true }, "layouts": { "LAYOUT_ansi_90": { @@ -122,4 +123,4 @@ ] } } -}
\ No newline at end of file +} diff --git a/keyboards/keychron/k13_pro/rules.mk b/keyboards/keychron/k13_pro/rules.mk index 98cf5c564b..1f9fc1ab58 100644 --- a/keyboards/keychron/k13_pro/rules.mk +++ b/keyboards/keychron/k13_pro/rules.mk @@ -1,7 +1,6 @@ # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST -OPT_DEFS += -DKC_BLUETOOTH_ENABLE SRC += matrix.c diff --git a/keyboards/keychron/k1_pro/info.json b/keyboards/keychron/k1_pro/info.json index e62f0e35d9..afde6612a5 100644 --- a/keyboards/keychron/k1_pro/info.json +++ b/keyboards/keychron/k1_pro/info.json @@ -24,7 +24,8 @@ "matrix_pins": { "rows": ["B5", "B4", "B3", "A15", "A14", "A13"], "cols": ["C15", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], - "custom_lite": true + "custom": true, + "custom_lite": true }, "layouts": { "LAYOUT_tkl_ansi": { @@ -124,4 +125,4 @@ ] } } -}
\ No newline at end of file +} diff --git a/keyboards/keychron/k1_pro/rules.mk b/keyboards/keychron/k1_pro/rules.mk index 98cf5c564b..1f9fc1ab58 100644 --- a/keyboards/keychron/k1_pro/rules.mk +++ b/keyboards/keychron/k1_pro/rules.mk @@ -1,7 +1,6 @@ # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST -OPT_DEFS += -DKC_BLUETOOTH_ENABLE SRC += matrix.c diff --git a/keyboards/keychron/k2_pro/info.json b/keyboards/keychron/k2_pro/info.json index 719ba5a259..573e36d4ef 100644 --- a/keyboards/keychron/k2_pro/info.json +++ b/keyboards/keychron/k2_pro/info.json @@ -24,7 +24,8 @@ "matrix_pins": { "rows": ["B5", "B4", "B3", "A15", "A14", "A13"], "cols": ["B0", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], - "custom_lite": true + "custom": true, + "custom_lite": true }, "layouts": { "LAYOUT_ansi_84": { @@ -311,4 +312,4 @@ ] } } -}
\ No newline at end of file +} diff --git a/keyboards/keychron/k2_pro/rules.mk b/keyboards/keychron/k2_pro/rules.mk index 15ebea7eb8..8e536fc345 100644 --- a/keyboards/keychron/k2_pro/rules.mk +++ b/keyboards/keychron/k2_pro/rules.mk @@ -1,7 +1,6 @@ # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST -OPT_DEFS += -DKC_BLUETOOTH_ENABLE SRC += matrix.c diff --git a/keyboards/keychron/k3_pro/info.json b/keyboards/keychron/k3_pro/info.json index c8eaeb4f88..604ef4ac72 100644 --- a/keyboards/keychron/k3_pro/info.json +++ b/keyboards/keychron/k3_pro/info.json @@ -24,7 +24,8 @@ "matrix_pins": { "rows": ["B5", "B4", "B3", "A15", "A14", "A13"], "cols": ["C15", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], - "custom_lite": true + "custom": true, + "custom_lite": true }, "layouts": { "LAYOUT_ansi_84": { @@ -311,4 +312,4 @@ ] } } -}
\ No newline at end of file +} diff --git a/keyboards/keychron/k3_pro/rules.mk b/keyboards/keychron/k3_pro/rules.mk index 15ebea7eb8..8e536fc345 100644 --- a/keyboards/keychron/k3_pro/rules.mk +++ b/keyboards/keychron/k3_pro/rules.mk @@ -1,7 +1,6 @@ # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST -OPT_DEFS += -DKC_BLUETOOTH_ENABLE SRC += matrix.c diff --git a/keyboards/keychron/k4_pro/info.json b/keyboards/keychron/k4_pro/info.json index f62064cbae..504cfc33a9 100644 --- a/keyboards/keychron/k4_pro/info.json +++ b/keyboards/keychron/k4_pro/info.json @@ -24,7 +24,8 @@ "matrix_pins": { "rows": ["B5", "B4", "B3", "A15", "A14", "A13"], "cols": ["B0", "A7", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], - "custom_lite": true + "custom": true, + "custom_lite": true }, "layouts": { "LAYOUT_ansi_100": { @@ -247,4 +248,4 @@ ] } } -}
\ No newline at end of file +} diff --git a/keyboards/keychron/k4_pro/rules.mk b/keyboards/keychron/k4_pro/rules.mk index 15ebea7eb8..8e536fc345 100644 --- a/keyboards/keychron/k4_pro/rules.mk +++ b/keyboards/keychron/k4_pro/rules.mk @@ -1,7 +1,6 @@ # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST -OPT_DEFS += -DKC_BLUETOOTH_ENABLE SRC += matrix.c diff --git a/keyboards/keychron/k5_pro/info.json b/keyboards/keychron/k5_pro/info.json index 68a187263d..69a8ba8730 100644 --- a/keyboards/keychron/k5_pro/info.json +++ b/keyboards/keychron/k5_pro/info.json @@ -24,7 +24,8 @@ "matrix_pins": { "rows": ["B5", "B4", "B3", "A15", "A14", "A13"], "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], - "custom_lite": true + "custom": true, + "custom_lite": true }, "layouts": { "LAYOUT_ansi_108": { diff --git a/keyboards/keychron/k5_pro/rules.mk b/keyboards/keychron/k5_pro/rules.mk index 98cf5c564b..1f9fc1ab58 100644 --- a/keyboards/keychron/k5_pro/rules.mk +++ b/keyboards/keychron/k5_pro/rules.mk @@ -1,7 +1,6 @@ # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST -OPT_DEFS += -DKC_BLUETOOTH_ENABLE SRC += matrix.c diff --git a/keyboards/keychron/k6_pro/info.json b/keyboards/keychron/k6_pro/info.json index e545466376..162e40a482 100644 --- a/keyboards/keychron/k6_pro/info.json +++ b/keyboards/keychron/k6_pro/info.json @@ -24,7 +24,8 @@ "matrix_pins": { "rows": ["B4", "B3", "A15", "A14", "A13"], "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], - "custom_lite": true + "custom": true, + "custom_lite": true }, "layouts": { "LAYOUT_ansi_68": { @@ -260,4 +261,4 @@ ] } } -}
\ No newline at end of file +} diff --git a/keyboards/keychron/k6_pro/rules.mk b/keyboards/keychron/k6_pro/rules.mk index 15ebea7eb8..8e536fc345 100644 --- a/keyboards/keychron/k6_pro/rules.mk +++ b/keyboards/keychron/k6_pro/rules.mk @@ -1,7 +1,6 @@ # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST -OPT_DEFS += -DKC_BLUETOOTH_ENABLE SRC += matrix.c diff --git a/keyboards/keychron/k7_pro/info.json b/keyboards/keychron/k7_pro/info.json index f4ed9fc733..848b868163 100644 --- a/keyboards/keychron/k7_pro/info.json +++ b/keyboards/keychron/k7_pro/info.json @@ -24,7 +24,8 @@ "matrix_pins": { "rows": ["B4", "B3", "A15", "A14", "A13"], "cols": ["C15", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], - "custom_lite": true + "custom": true, + "custom_lite": true }, "layouts": { "LAYOUT_ansi_68": { @@ -104,4 +105,4 @@ ] } } -}
\ No newline at end of file +} diff --git a/keyboards/keychron/k7_pro/rules.mk b/keyboards/keychron/k7_pro/rules.mk index 15ebea7eb8..8e536fc345 100644 --- a/keyboards/keychron/k7_pro/rules.mk +++ b/keyboards/keychron/k7_pro/rules.mk @@ -1,7 +1,6 @@ # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST -OPT_DEFS += -DKC_BLUETOOTH_ENABLE SRC += matrix.c diff --git a/keyboards/keychron/k8_pro/info.json b/keyboards/keychron/k8_pro/info.json index 4e6e52f0c6..f19075b3b8 100644 --- a/keyboards/keychron/k8_pro/info.json +++ b/keyboards/keychron/k8_pro/info.json @@ -24,6 +24,7 @@ "matrix_pins": { "rows": ["B5", "B4", "B3", "A15", "A14", "A13"], "cols": ["B0", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], + "custom": true, "custom_lite": true }, "layouts": { diff --git a/keyboards/keychron/k8_pro/rules.mk b/keyboards/keychron/k8_pro/rules.mk index 15ebea7eb8..8e536fc345 100644 --- a/keyboards/keychron/k8_pro/rules.mk +++ b/keyboards/keychron/k8_pro/rules.mk @@ -1,7 +1,6 @@ # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST -OPT_DEFS += -DKC_BLUETOOTH_ENABLE SRC += matrix.c diff --git a/keyboards/keychron/k9_pro/info.json b/keyboards/keychron/k9_pro/info.json index fdc495f607..8269c14a84 100644 --- a/keyboards/keychron/k9_pro/info.json +++ b/keyboards/keychron/k9_pro/info.json @@ -24,7 +24,8 @@ "matrix_pins": { "rows": ["B4", "B3", "A15", "A14", "A13"], "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], - "custom_lite": true + "custom": true, + "custom_lite": true }, "layouts": { "LAYOUT_ansi_61": { @@ -97,4 +98,4 @@ ] } } -}
\ No newline at end of file +} diff --git a/keyboards/keychron/k9_pro/rules.mk b/keyboards/keychron/k9_pro/rules.mk index 98cf5c564b..1f9fc1ab58 100644 --- a/keyboards/keychron/k9_pro/rules.mk +++ b/keyboards/keychron/k9_pro/rules.mk @@ -1,7 +1,6 @@ # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST -OPT_DEFS += -DKC_BLUETOOTH_ENABLE SRC += matrix.c diff --git a/keyboards/keychron/q1_pro/info.json b/keyboards/keychron/q1_pro/info.json index bb1a34b25a..865117691a 100644 --- a/keyboards/keychron/q1_pro/info.json +++ b/keyboards/keychron/q1_pro/info.json @@ -3,11 +3,6 @@ "manufacturer": "Keychron", "url": "https://github.com/Keychron", "maintainer": "lokher", - "encoder": { - "rotary": [ - {"pin_a": "A10", "pin_b": "A0", "resolution": 4} - ] - }, "processor": "STM32L432", "bootloader": "stm32-dfu", "usb": { @@ -32,7 +27,13 @@ "matrix_pins": { "rows": ["B5", "B4", "B3", "A15", "A14", "A13"], "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], - "custom_lite": true + "custom": true, + "custom_lite": true + }, + "encoder": { + "rotary": [ + {"pin_a": "A10", "pin_b": "A0", "resolution": 4} + ] }, "rgb_matrix": { "driver": "CKLED2001", @@ -60,4 +61,4 @@ "solid_splash": true } } -}
\ No newline at end of file +} diff --git a/keyboards/keychron/q1_pro/rules.mk b/keyboards/keychron/q1_pro/rules.mk index 15ebea7eb8..8e536fc345 100644 --- a/keyboards/keychron/q1_pro/rules.mk +++ b/keyboards/keychron/q1_pro/rules.mk @@ -1,7 +1,6 @@ # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST -OPT_DEFS += -DKC_BLUETOOTH_ENABLE SRC += matrix.c diff --git a/keyboards/keychron/q2_pro/info.json b/keyboards/keychron/q2_pro/info.json index 65e3eab0fc..cbe501f42e 100644 --- a/keyboards/keychron/q2_pro/info.json +++ b/keyboards/keychron/q2_pro/info.json @@ -3,11 +3,6 @@ "manufacturer": "Keychron", "url": "https://github.com/Keychron", "maintainer": "lokher", - "encoder": { - "rotary": [ - {"pin_a": "A10", "pin_b": "A0", "resolution": 4} - ] - }, "processor": "STM32L432", "bootloader": "stm32-dfu", "usb": { @@ -31,7 +26,13 @@ "matrix_pins": { "rows": ["B4", "B3", "A15", "A14", "A13"], "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], - "custom_lite": true + "custom": true, + "custom_lite": true + }, + "encoder": { + "rotary": [ + {"pin_a": "A10", "pin_b": "A0", "resolution": 4} + ] }, "rgb_matrix": { "driver": "CKLED2001", @@ -59,4 +60,4 @@ "solid_splash": true } } -}
\ No newline at end of file +} diff --git a/keyboards/keychron/q2_pro/rules.mk b/keyboards/keychron/q2_pro/rules.mk index 98cf5c564b..1f9fc1ab58 100644 --- a/keyboards/keychron/q2_pro/rules.mk +++ b/keyboards/keychron/q2_pro/rules.mk @@ -1,7 +1,6 @@ # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST -OPT_DEFS += -DKC_BLUETOOTH_ENABLE SRC += matrix.c diff --git a/keyboards/keychron/q3_pro/info.json b/keyboards/keychron/q3_pro/info.json index 93b771951b..d8b93e799d 100644 --- a/keyboards/keychron/q3_pro/info.json +++ b/keyboards/keychron/q3_pro/info.json @@ -3,11 +3,6 @@ "manufacturer": "Keychron", "url": "https://github.com/Keychron", "maintainer": "lokher", - "encoder": { - "rotary": [ - {"pin_a": "A10", "pin_b": "A0", "resolution": 4} - ] - }, "processor": "STM32L432", "bootloader": "stm32-dfu", "usb": { @@ -32,7 +27,13 @@ "matrix_pins": { "rows": ["B5", "B4", "B3", "A15", "A14", "A13"], "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], - "custom_lite": true + "custom": true, + "custom_lite": true + }, + "encoder": { + "rotary": [ + {"pin_a": "A10", "pin_b": "A0", "resolution": 4} + ] }, "rgb_matrix": { "driver": "CKLED2001", @@ -60,4 +61,4 @@ "solid_splash": true } } -}
\ No newline at end of file +} diff --git a/keyboards/keychron/q3_pro/rules.mk b/keyboards/keychron/q3_pro/rules.mk index 98cf5c564b..1f9fc1ab58 100644 --- a/keyboards/keychron/q3_pro/rules.mk +++ b/keyboards/keychron/q3_pro/rules.mk @@ -1,7 +1,6 @@ # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST -OPT_DEFS += -DKC_BLUETOOTH_ENABLE SRC += matrix.c |