Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
6d82c92476
2 changed files with 6 additions and 6 deletions
|
@ -7,9 +7,9 @@ F_CPU = 8000000
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = qmk-dfu
|
BOOTLOADER = qmk-dfu
|
||||||
|
|
||||||
SRC += ../usart.c \
|
SRC += usart.c \
|
||||||
../ble.c \
|
ble.c \
|
||||||
../main.c
|
main.c
|
||||||
|
|
||||||
OPT_DEFS += -DPROTOCOL_BLE
|
OPT_DEFS += -DPROTOCOL_BLE
|
||||||
OPT_DEFS += -DUART_RX1_BUFFER_SIZE=16 -DUART_TX1_BUFFER_SIZE=16
|
OPT_DEFS += -DUART_RX1_BUFFER_SIZE=16 -DUART_TX1_BUFFER_SIZE=16
|
||||||
|
|
|
@ -7,9 +7,9 @@ F_CPU = 8000000
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = qmk-dfu
|
BOOTLOADER = qmk-dfu
|
||||||
|
|
||||||
SRC += ../usart.c \
|
SRC += usart.c \
|
||||||
../ble.c \
|
ble.c \
|
||||||
../main.c
|
main.c
|
||||||
|
|
||||||
OPT_DEFS += -DPROTOCOL_BLE
|
OPT_DEFS += -DPROTOCOL_BLE
|
||||||
OPT_DEFS += -DUART_RX1_BUFFER_SIZE=16 -DUART_TX1_BUFFER_SIZE=16
|
OPT_DEFS += -DUART_RX1_BUFFER_SIZE=16 -DUART_TX1_BUFFER_SIZE=16
|
||||||
|
|
Loading…
Reference in a new issue