diff options
| author | QMK Bot <hello@qmk.fm> | 2021-07-31 00:34:43 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-07-31 00:34:43 +0000 |
| commit | 6d82c92476240255eecbab850db26b8706184c83 (patch) | |
| tree | 5c4a864c58d5e6b19fcf25e05bd9ce18812eb50b | |
| parent | 7c70a90867c1022a9ba633945034f87c78712743 (diff) | |
| parent | a4c050b5ae30bd21be4a4bad596f1275a6d16bfc (diff) | |
| download | qmk_firmware-6d82c92476240255eecbab850db26b8706184c83.tar.gz qmk_firmware-6d82c92476240255eecbab850db26b8706184c83.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/bioi/g60/rules.mk | 6 | ||||
| -rw-r--r-- | keyboards/bioi/morgan65/rules.mk | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/keyboards/bioi/g60/rules.mk b/keyboards/bioi/g60/rules.mk index a7e616d4d..dc1a000f3 100644 --- a/keyboards/bioi/g60/rules.mk +++ b/keyboards/bioi/g60/rules.mk | |||
| @@ -7,9 +7,9 @@ F_CPU = 8000000 | |||
| 7 | # Bootloader selection | 7 | # Bootloader selection |
| 8 | BOOTLOADER = qmk-dfu | 8 | BOOTLOADER = qmk-dfu |
| 9 | 9 | ||
| 10 | SRC += ../usart.c \ | 10 | SRC += usart.c \ |
| 11 | ../ble.c \ | 11 | ble.c \ |
| 12 | ../main.c | 12 | main.c |
| 13 | 13 | ||
| 14 | OPT_DEFS += -DPROTOCOL_BLE | 14 | OPT_DEFS += -DPROTOCOL_BLE |
| 15 | OPT_DEFS += -DUART_RX1_BUFFER_SIZE=16 -DUART_TX1_BUFFER_SIZE=16 | 15 | OPT_DEFS += -DUART_RX1_BUFFER_SIZE=16 -DUART_TX1_BUFFER_SIZE=16 |
diff --git a/keyboards/bioi/morgan65/rules.mk b/keyboards/bioi/morgan65/rules.mk index a7e616d4d..dc1a000f3 100644 --- a/keyboards/bioi/morgan65/rules.mk +++ b/keyboards/bioi/morgan65/rules.mk | |||
| @@ -7,9 +7,9 @@ F_CPU = 8000000 | |||
| 7 | # Bootloader selection | 7 | # Bootloader selection |
| 8 | BOOTLOADER = qmk-dfu | 8 | BOOTLOADER = qmk-dfu |
| 9 | 9 | ||
| 10 | SRC += ../usart.c \ | 10 | SRC += usart.c \ |
| 11 | ../ble.c \ | 11 | ble.c \ |
| 12 | ../main.c | 12 | main.c |
| 13 | 13 | ||
| 14 | OPT_DEFS += -DPROTOCOL_BLE | 14 | OPT_DEFS += -DPROTOCOL_BLE |
| 15 | OPT_DEFS += -DUART_RX1_BUFFER_SIZE=16 -DUART_TX1_BUFFER_SIZE=16 | 15 | OPT_DEFS += -DUART_RX1_BUFFER_SIZE=16 -DUART_TX1_BUFFER_SIZE=16 |