summaryrefslogtreecommitdiff
path: root/builddefs
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2022-09-08 04:59:24 +1000
committerGitHub <noreply@github.com>2022-09-07 19:59:24 +0100
commitf7d2b001bc4f79164e9ea3a4ff7faa54be0b7d82 (patch)
tree304a51de5cb8a64958645812941b0ebfe65223d9 /builddefs
parentcf8cdd19920b1810f3d3ecc987943ad8d59023b4 (diff)
Move Bluetooth-related function calls up to host/keyboard level (#18274)
* Move Bluetooth-related function calls up to host/keyboard level * Remove pointless set_output() call * Move bluetooth (rn42) init to end of keyboard_init() * Enable SPI/UART for ChibiOS targets * Some more slight tweaks
Diffstat (limited to 'builddefs')
-rw-r--r--builddefs/common_features.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 9fa9e18814..f9618709c9 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -882,14 +882,14 @@ ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
SRC += outputselect.c
ifeq ($(strip $(BLUETOOTH_DRIVER)), BluefruitLE)
- OPT_DEFS += -DBLUETOOTH_BLUEFRUIT_LE
- SRC += analog.c
+ OPT_DEFS += -DBLUETOOTH_BLUEFRUIT_LE -DHAL_USE_SPI=TRUE
SRC += $(DRIVER_PATH)/bluetooth/bluefruit_le.cpp
+ QUANTUM_LIB_SRC += analog.c
QUANTUM_LIB_SRC += spi_master.c
endif
ifeq ($(strip $(BLUETOOTH_DRIVER)), RN42)
- OPT_DEFS += -DBLUETOOTH_RN42
+ OPT_DEFS += -DBLUETOOTH_RN42 -DHAL_USE_SERIAL=TRUE
SRC += $(DRIVER_PATH)/bluetooth/rn42.c
QUANTUM_LIB_SRC += uart.c
endif