move OPT_DEFS += -DKC_BLUETOOTH_ENABLE to bluetooth.mk

This commit is contained in:
lokher 2023-06-13 10:58:50 +08:00
parent b9a3e3dd3c
commit 5856c95340
29 changed files with 57 additions and 54 deletions

View file

@ -1,3 +1,6 @@
OPT_DEFS += -DKC_BLUETOOTH_ENABLE
BLUETOOTH_DIR = bluetooth BLUETOOTH_DIR = bluetooth
SRC += \ SRC += \
$(BLUETOOTH_DIR)/bluetooth.c \ $(BLUETOOTH_DIR)/bluetooth.c \

View file

@ -24,6 +24,7 @@
"matrix_pins": { "matrix_pins": {
"rows": ["B5", "B4", "B3", "A15", "A14", "A13"], "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], "cols": ["B0", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
"custom": true,
"custom_lite": true "custom_lite": true
}, },
"layouts": { "layouts": {

View file

@ -1,7 +1,6 @@
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
OPT_DEFS += -DKC_BLUETOOTH_ENABLE
SRC += matrix.c SRC += matrix.c

View file

@ -24,6 +24,7 @@
"matrix_pins": { "matrix_pins": {
"rows": ["B5", "B4", "B3", "A15", "A14", "A13"], "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], "cols": ["C15", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
"custom": true,
"custom_lite": true "custom_lite": true
}, },
"layouts": { "layouts": {

View file

@ -1,7 +1,6 @@
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
OPT_DEFS += -DKC_BLUETOOTH_ENABLE
SRC += matrix.c SRC += matrix.c

View file

@ -24,6 +24,7 @@
"matrix_pins": { "matrix_pins": {
"rows": ["B5", "B4", "B3", "A15", "A14", "A13"], "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], "cols": ["C15", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
"custom": true,
"custom_lite": true "custom_lite": true
}, },
"layouts": { "layouts": {

View file

@ -1,7 +1,6 @@
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
OPT_DEFS += -DKC_BLUETOOTH_ENABLE
SRC += matrix.c SRC += matrix.c

View file

@ -24,6 +24,7 @@
"matrix_pins": { "matrix_pins": {
"rows": ["B5", "B4", "B3", "A15", "A14", "A13"], "rows": ["B5", "B4", "B3", "A15", "A14", "A13"],
"cols": ["B0", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], "cols": ["B0", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
"custom": true,
"custom_lite": true "custom_lite": true
}, },
"layouts": { "layouts": {

View file

@ -1,7 +1,6 @@
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
OPT_DEFS += -DKC_BLUETOOTH_ENABLE
SRC += matrix.c SRC += matrix.c

View file

@ -24,6 +24,7 @@
"matrix_pins": { "matrix_pins": {
"rows": ["B5", "B4", "B3", "A15", "A14", "A13"], "rows": ["B5", "B4", "B3", "A15", "A14", "A13"],
"cols": ["C15", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], "cols": ["C15", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
"custom": true,
"custom_lite": true "custom_lite": true
}, },
"layouts": { "layouts": {

View file

@ -1,7 +1,6 @@
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
OPT_DEFS += -DKC_BLUETOOTH_ENABLE
SRC += matrix.c SRC += matrix.c

View file

@ -24,6 +24,7 @@
"matrix_pins": { "matrix_pins": {
"rows": ["B5", "B4", "B3", "A15", "A14", "A13"], "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], "cols": ["B0", "A7", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
"custom": true,
"custom_lite": true "custom_lite": true
}, },
"layouts": { "layouts": {

View file

@ -1,7 +1,6 @@
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
OPT_DEFS += -DKC_BLUETOOTH_ENABLE
SRC += matrix.c SRC += matrix.c

View file

@ -24,6 +24,7 @@
"matrix_pins": { "matrix_pins": {
"rows": ["B5", "B4", "B3", "A15", "A14", "A13"], "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], "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
"custom": true,
"custom_lite": true "custom_lite": true
}, },
"layouts": { "layouts": {

View file

@ -1,7 +1,6 @@
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
OPT_DEFS += -DKC_BLUETOOTH_ENABLE
SRC += matrix.c SRC += matrix.c

View file

@ -24,6 +24,7 @@
"matrix_pins": { "matrix_pins": {
"rows": ["B4", "B3", "A15", "A14", "A13"], "rows": ["B4", "B3", "A15", "A14", "A13"],
"cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
"custom": true,
"custom_lite": true "custom_lite": true
}, },
"layouts": { "layouts": {

View file

@ -1,7 +1,6 @@
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
OPT_DEFS += -DKC_BLUETOOTH_ENABLE
SRC += matrix.c SRC += matrix.c

View file

@ -24,6 +24,7 @@
"matrix_pins": { "matrix_pins": {
"rows": ["B4", "B3", "A15", "A14", "A13"], "rows": ["B4", "B3", "A15", "A14", "A13"],
"cols": ["C15", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], "cols": ["C15", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
"custom": true,
"custom_lite": true "custom_lite": true
}, },
"layouts": { "layouts": {

View file

@ -1,7 +1,6 @@
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
OPT_DEFS += -DKC_BLUETOOTH_ENABLE
SRC += matrix.c SRC += matrix.c

View file

@ -24,6 +24,7 @@
"matrix_pins": { "matrix_pins": {
"rows": ["B5", "B4", "B3", "A15", "A14", "A13"], "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], "cols": ["B0", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
"custom": true,
"custom_lite": true "custom_lite": true
}, },
"layouts": { "layouts": {

View file

@ -1,7 +1,6 @@
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
OPT_DEFS += -DKC_BLUETOOTH_ENABLE
SRC += matrix.c SRC += matrix.c

View file

@ -24,6 +24,7 @@
"matrix_pins": { "matrix_pins": {
"rows": ["B4", "B3", "A15", "A14", "A13"], "rows": ["B4", "B3", "A15", "A14", "A13"],
"cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
"custom": true,
"custom_lite": true "custom_lite": true
}, },
"layouts": { "layouts": {

View file

@ -1,7 +1,6 @@
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
OPT_DEFS += -DKC_BLUETOOTH_ENABLE
SRC += matrix.c SRC += matrix.c

View file

@ -3,11 +3,6 @@
"manufacturer": "Keychron", "manufacturer": "Keychron",
"url": "https://github.com/Keychron", "url": "https://github.com/Keychron",
"maintainer": "lokher", "maintainer": "lokher",
"encoder": {
"rotary": [
{"pin_a": "A10", "pin_b": "A0", "resolution": 4}
]
},
"processor": "STM32L432", "processor": "STM32L432",
"bootloader": "stm32-dfu", "bootloader": "stm32-dfu",
"usb": { "usb": {
@ -32,8 +27,14 @@
"matrix_pins": { "matrix_pins": {
"rows": ["B5", "B4", "B3", "A15", "A14", "A13"], "rows": ["B5", "B4", "B3", "A15", "A14", "A13"],
"cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
"custom": true,
"custom_lite": true "custom_lite": true
}, },
"encoder": {
"rotary": [
{"pin_a": "A10", "pin_b": "A0", "resolution": 4}
]
},
"rgb_matrix": { "rgb_matrix": {
"driver": "CKLED2001", "driver": "CKLED2001",
"animations": { "animations": {

View file

@ -1,7 +1,6 @@
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
OPT_DEFS += -DKC_BLUETOOTH_ENABLE
SRC += matrix.c SRC += matrix.c

View file

@ -3,11 +3,6 @@
"manufacturer": "Keychron", "manufacturer": "Keychron",
"url": "https://github.com/Keychron", "url": "https://github.com/Keychron",
"maintainer": "lokher", "maintainer": "lokher",
"encoder": {
"rotary": [
{"pin_a": "A10", "pin_b": "A0", "resolution": 4}
]
},
"processor": "STM32L432", "processor": "STM32L432",
"bootloader": "stm32-dfu", "bootloader": "stm32-dfu",
"usb": { "usb": {
@ -31,8 +26,14 @@
"matrix_pins": { "matrix_pins": {
"rows": ["B4", "B3", "A15", "A14", "A13"], "rows": ["B4", "B3", "A15", "A14", "A13"],
"cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
"custom": true,
"custom_lite": true "custom_lite": true
}, },
"encoder": {
"rotary": [
{"pin_a": "A10", "pin_b": "A0", "resolution": 4}
]
},
"rgb_matrix": { "rgb_matrix": {
"driver": "CKLED2001", "driver": "CKLED2001",
"animations": { "animations": {

View file

@ -1,7 +1,6 @@
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
OPT_DEFS += -DKC_BLUETOOTH_ENABLE
SRC += matrix.c SRC += matrix.c

View file

@ -3,11 +3,6 @@
"manufacturer": "Keychron", "manufacturer": "Keychron",
"url": "https://github.com/Keychron", "url": "https://github.com/Keychron",
"maintainer": "lokher", "maintainer": "lokher",
"encoder": {
"rotary": [
{"pin_a": "A10", "pin_b": "A0", "resolution": 4}
]
},
"processor": "STM32L432", "processor": "STM32L432",
"bootloader": "stm32-dfu", "bootloader": "stm32-dfu",
"usb": { "usb": {
@ -32,8 +27,14 @@
"matrix_pins": { "matrix_pins": {
"rows": ["B5", "B4", "B3", "A15", "A14", "A13"], "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], "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
"custom": true,
"custom_lite": true "custom_lite": true
}, },
"encoder": {
"rotary": [
{"pin_a": "A10", "pin_b": "A0", "resolution": 4}
]
},
"rgb_matrix": { "rgb_matrix": {
"driver": "CKLED2001", "driver": "CKLED2001",
"animations": { "animations": {

View file

@ -1,7 +1,6 @@
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
OPT_DEFS += -DKC_BLUETOOTH_ENABLE
SRC += matrix.c SRC += matrix.c