diff options
| author | Xyverz <xyverz@gmail.com> | 2017-04-02 14:49:39 -0700 |
|---|---|---|
| committer | Xyverz <xyverz@gmail.com> | 2017-04-02 14:49:39 -0700 |
| commit | c034b61b1abb2bf23187abae562bf53916c60fa1 (patch) | |
| tree | d36aa00c7ae93ce144445638b61269d3a0dd5f50 /tmk_core/protocol/lufa.mk | |
| parent | 787304647961f4cb654188ddb88c22dd7991ab87 (diff) | |
| parent | 3448d5d4874a2775f85320a2be69edd241575d46 (diff) | |
| download | firmware-c034b61b1abb2bf23187abae562bf53916c60fa1.tar.gz firmware-c034b61b1abb2bf23187abae562bf53916c60fa1.tar.bz2 firmware-c034b61b1abb2bf23187abae562bf53916c60fa1.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tmk_core/protocol/lufa.mk')
| -rw-r--r-- | tmk_core/protocol/lufa.mk | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/tmk_core/protocol/lufa.mk b/tmk_core/protocol/lufa.mk index de0cc795f..7ce727dab 100644 --- a/tmk_core/protocol/lufa.mk +++ b/tmk_core/protocol/lufa.mk @@ -22,11 +22,21 @@ ifeq ($(strip $(MIDI_ENABLE)), yes) include $(TMK_PATH)/protocol/midi.mk endif -ifeq ($(strip $(ADAFRUIT_BLE_ENABLE)), yes) - LUFA_SRC += $(LUFA_DIR)/adafruit_ble.cpp +ifeq ($(strip $(BLUETOOTH_ENABLE)), yes) + LUFA_SRC += $(LUFA_DIR)/bluetooth.c \ + $(TMK_DIR)/protocol/serial_uart.c endif -ifeq ($(strip $(BLUETOOTH_ENABLE)), yes) +ifeq ($(strip $(BLUETOOTH)), AdafruitBLE) + LUFA_SRC += $(LUFA_DIR)/adafruit_ble.cpp +endif + +ifeq ($(strip $(BLUETOOTH)), AdafruitEZKey) + LUFA_SRC += $(LUFA_DIR)/bluetooth.c \ + $(TMK_DIR)/protocol/serial_uart.c +endif + +ifeq ($(strip $(BLUETOOTH)), RN42) LUFA_SRC += $(LUFA_DIR)/bluetooth.c \ $(TMK_DIR)/protocol/serial_uart.c endif @@ -54,6 +64,7 @@ LUFA_OPTS += -DUSE_FLASH_DESCRIPTORS LUFA_OPTS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" #LUFA_OPTS += -DINTERRUPT_CONTROL_ENDPOINT LUFA_OPTS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 LUFA_OPTS += -DFIXED_NUM_CONFIGURATIONS=1 # Remote wakeup fix for ATmega32U2 https://github.com/tmk/tmk_keyboard/issues/361 |