diff options
| author | Ryan <fauxpark@gmail.com> | 2021-09-21 19:58:46 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-21 19:58:46 +1000 |
| commit | 20ea5f3fb5ba108153148e57981a7e804fd4be61 (patch) | |
| tree | c6ff504e55d223df435ca439673e4771d480f079 | |
| parent | c38a7308054f2072d234ee0d44d3bea9f809a63d (diff) | |
| download | qmk_firmware-20ea5f3fb5ba108153148e57981a7e804fd4be61.tar.gz qmk_firmware-20ea5f3fb5ba108153148e57981a7e804fd4be61.zip | |
Relocate Adafruit BLE code (#14530)
| -rw-r--r-- | common_features.mk | 5 | ||||
| -rw-r--r-- | drivers/bluetooth/adafruit_ble.cpp (renamed from tmk_core/protocol/lufa/adafruit_ble.cpp) | 0 | ||||
| -rw-r--r-- | drivers/bluetooth/adafruit_ble.h (renamed from tmk_core/protocol/lufa/adafruit_ble.h) | 0 | ||||
| -rw-r--r-- | drivers/bluetooth/outputselect.c (renamed from tmk_core/protocol/lufa/outputselect.c) | 0 | ||||
| -rw-r--r-- | drivers/bluetooth/outputselect.h (renamed from tmk_core/protocol/lufa/outputselect.h) | 0 | ||||
| -rw-r--r-- | drivers/bluetooth/ringbuffer.hpp (renamed from tmk_core/protocol/lufa/ringbuffer.hpp) | 0 |
6 files changed, 3 insertions, 2 deletions
diff --git a/common_features.mk b/common_features.mk index 4633ccce1f..8b5ee071d7 100644 --- a/common_features.mk +++ b/common_features.mk @@ -767,19 +767,20 @@ ifeq ($(strip $(USBPD_ENABLE)), yes) endif BLUETOOTH_ENABLE ?= no -VALID_BLUETOOTH_DRIVER_TYPES = AdafruitBLE RN42 custom +VALID_BLUETOOTH_DRIVER_TYPES := AdafruitBLE RN42 custom ifeq ($(strip $(BLUETOOTH_ENABLE)), yes) ifeq ($(filter $(strip $(BLUETOOTH_DRIVER)),$(VALID_BLUETOOTH_DRIVER_TYPES)),) $(error "$(BLUETOOTH_DRIVER)" is not a valid Bluetooth driver type) endif OPT_DEFS += -DBLUETOOTH_ENABLE NO_USB_STARTUP_CHECK := yes + COMMON_VPATH += $(DRIVER_PATH)/bluetooth SRC += outputselect.c ifeq ($(strip $(BLUETOOTH_DRIVER)), AdafruitBLE) OPT_DEFS += -DMODULE_ADAFRUIT_BLE SRC += analog.c - SRC += $(LUFA_DIR)/adafruit_ble.cpp + SRC += $(DRIVER_PATH)/bluetooth/adafruit_ble.cpp QUANTUM_LIB_SRC += spi_master.c endif diff --git a/tmk_core/protocol/lufa/adafruit_ble.cpp b/drivers/bluetooth/adafruit_ble.cpp index 3f2cc35734..3f2cc35734 100644 --- a/tmk_core/protocol/lufa/adafruit_ble.cpp +++ b/drivers/bluetooth/adafruit_ble.cpp diff --git a/tmk_core/protocol/lufa/adafruit_ble.h b/drivers/bluetooth/adafruit_ble.h index b43e0771d9..b43e0771d9 100644 --- a/tmk_core/protocol/lufa/adafruit_ble.h +++ b/drivers/bluetooth/adafruit_ble.h diff --git a/tmk_core/protocol/lufa/outputselect.c b/drivers/bluetooth/outputselect.c index f758c65280..f758c65280 100644 --- a/tmk_core/protocol/lufa/outputselect.c +++ b/drivers/bluetooth/outputselect.c diff --git a/tmk_core/protocol/lufa/outputselect.h b/drivers/bluetooth/outputselect.h index c4548e1122..c4548e1122 100644 --- a/tmk_core/protocol/lufa/outputselect.h +++ b/drivers/bluetooth/outputselect.h diff --git a/tmk_core/protocol/lufa/ringbuffer.hpp b/drivers/bluetooth/ringbuffer.hpp index 70a3c4881d..70a3c4881d 100644 --- a/tmk_core/protocol/lufa/ringbuffer.hpp +++ b/drivers/bluetooth/ringbuffer.hpp |