Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't compile outputselect.c if Bluetooth is disabled #9356

Merged
merged 1 commit into from
Jun 17, 2020
Merged

Don't compile outputselect.c if Bluetooth is disabled #9356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions quantum/quantum.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <ctype.h>
#include "quantum.h"

#ifdef PROTOCOL_LUFA
#ifdef BLUETOOTH_ENABLE
# include "outputselect.h"
#endif

Expand Down Expand Up @@ -627,7 +627,7 @@ void matrix_init_quantum() {
#ifdef HAPTIC_ENABLE
haptic_init();
#endif
#ifdef OUTPUT_AUTO_ENABLE
#if defined(BLUETOOTH_ENABLE) && defined(OUTPUT_AUTO_ENABLE)
set_output(OUTPUT_AUTO);
#endif
#ifdef DIP_SWITCH_ENABLE
Expand Down
21 changes: 12 additions & 9 deletions tmk_core/protocol/lufa.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,33 +15,36 @@ else
endif

LUFA_SRC = lufa.c \
usb_descriptor.c \
outputselect.c \
$(LUFA_SRC_USB)
usb_descriptor.c \
$(LUFA_SRC_USB)

ifeq ($(strip $(MIDI_ENABLE)), yes)
include $(TMK_PATH)/protocol/midi.mk
endif

ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
LUFA_SRC += $(LUFA_DIR)/bluetooth.c \
$(TMK_DIR)/protocol/serial_uart.c
outputselect.c \
$(TMK_DIR)/protocol/serial_uart.c
endif

ifeq ($(strip $(BLUETOOTH)), AdafruitBLE)
LUFA_SRC += spi_master.c
LUFA_SRC += analog.c
LUFA_SRC += $(LUFA_DIR)/adafruit_ble.cpp
LUFA_SRC += spi_master.c \
analog.c \
outputselect.c \
$(LUFA_DIR)/adafruit_ble.cpp
endif

ifeq ($(strip $(BLUETOOTH)), AdafruitEZKey)
LUFA_SRC += $(LUFA_DIR)/bluetooth.c \
$(TMK_DIR)/protocol/serial_uart.c
outputselect.c \
$(TMK_DIR)/protocol/serial_uart.c
endif

ifeq ($(strip $(BLUETOOTH)), RN42)
LUFA_SRC += $(LUFA_DIR)/bluetooth.c \
$(TMK_DIR)/protocol/serial_uart.c
outputselect.c \
$(TMK_DIR)/protocol/serial_uart.c
endif

ifeq ($(strip $(VIRTSER_ENABLE)), yes)
Expand Down
16 changes: 9 additions & 7 deletions tmk_core/protocol/lufa/lufa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
#include "lufa.h"
#include "quantum.h"
#include <util/atomic.h>
#include "outputselect.h"

#ifdef NKRO_ENABLE
# include "keycode_config.h"
Expand All @@ -66,6 +65,7 @@ extern keymap_config_t keymap_config;
#endif

#ifdef BLUETOOTH_ENABLE
# include "outputselect.h"
# ifdef MODULE_ADAFRUIT_BLE
# include "adafruit_ble.h"
# else
Expand Down Expand Up @@ -554,9 +554,10 @@ static uint8_t keyboard_leds(void) { return keyboard_led_state; }
*/
static void send_keyboard(report_keyboard_t *report) {
uint8_t timeout = 255;
uint8_t where = where_to_send();

#ifdef BLUETOOTH_ENABLE
uint8_t where = where_to_send();

if (where == OUTPUT_BLUETOOTH || where == OUTPUT_USB_AND_BT) {
# ifdef MODULE_ADAFRUIT_BLE
adafruit_ble_send_keys(report->mods, report->keys, sizeof(report->keys));
Expand All @@ -578,11 +579,11 @@ static void send_keyboard(report_keyboard_t *report) {
}
# endif
}
#endif

if (where != OUTPUT_USB && where != OUTPUT_USB_AND_BT) {
return;
}
#endif

/* Select the Keyboard Report Endpoint */
uint8_t ep = KEYBOARD_IN_EPNUM;
Expand Down Expand Up @@ -618,9 +619,10 @@ static void send_keyboard(report_keyboard_t *report) {
static void send_mouse(report_mouse_t *report) {
#ifdef MOUSE_ENABLE
uint8_t timeout = 255;
uint8_t where = where_to_send();

# ifdef BLUETOOTH_ENABLE
uint8_t where = where_to_send();

if (where == OUTPUT_BLUETOOTH || where == OUTPUT_USB_AND_BT) {
# ifdef MODULE_ADAFRUIT_BLE
// FIXME: mouse buttons
Expand All @@ -637,11 +639,11 @@ static void send_mouse(report_mouse_t *report) {
bluefruit_serial_send(0x00);
# endif
}
# endif

if (where != OUTPUT_USB && where != OUTPUT_USB_AND_BT) {
return;
}
# endif

/* Select the Mouse Report Endpoint */
Endpoint_SelectEndpoint(MOUSE_IN_EPNUM);
Expand Down Expand Up @@ -696,9 +698,9 @@ static void send_system(uint16_t data) {
*/
static void send_consumer(uint16_t data) {
#ifdef EXTRAKEY_ENABLE
# ifdef BLUETOOTH_ENABLE
uint8_t where = where_to_send();

# ifdef BLUETOOTH_ENABLE
if (where == OUTPUT_BLUETOOTH || where == OUTPUT_USB_AND_BT) {
# ifdef MODULE_ADAFRUIT_BLE
adafruit_ble_send_consumer_key(data, 0);
Expand Down Expand Up @@ -728,11 +730,11 @@ static void send_consumer(uint16_t data) {
bluefruit_serial_send(0x00);
# endif
}
# endif

if (where != OUTPUT_USB && where != OUTPUT_USB_AND_BT) {
return;
}
# endif

send_extra(REPORT_ID_CONSUMER, data);
#endif
Expand Down