summaryrefslogtreecommitdiff
path: root/quantum/quantum.c
diff options
context:
space:
mode:
Diffstat (limited to 'quantum/quantum.c')
-rw-r--r--quantum/quantum.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 044a156128..dab6c9172f 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -17,7 +17,7 @@
#include <ctype.h>
#include "quantum.h"
-#ifdef PROTOCOL_LUFA
+#ifdef BLUETOOTH_ENABLE
# include "outputselect.h"
#endif
@@ -277,6 +277,9 @@ bool process_record_quantum(keyrecord_t *record) {
#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
process_rgb(keycode, record) &&
#endif
+#ifdef JOYSTICK_ENABLE
+ process_joystick(keycode, record) &&
+#endif
true)) {
return false;
}
@@ -618,7 +621,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