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/outputselect.c | |
| parent | 787304647961f4cb654188ddb88c22dd7991ab87 (diff) | |
| parent | 3448d5d4874a2775f85320a2be69edd241575d46 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tmk_core/protocol/lufa/outputselect.c')
| -rw-r--r-- | tmk_core/protocol/lufa/outputselect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tmk_core/protocol/lufa/outputselect.c b/tmk_core/protocol/lufa/outputselect.c index 5d2457bfff..0df5d3b75a 100644 --- a/tmk_core/protocol/lufa/outputselect.c +++ b/tmk_core/protocol/lufa/outputselect.c @@ -14,7 +14,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "lufa.h" #include "outputselect.h" -#ifdef ADAFRUIT_BLE_ENABLE +#ifdef MODULE_ADAFRUIT_BLE #include "adafruit_ble.h" #endif @@ -34,9 +34,9 @@ uint8_t auto_detect_output(void) { return OUTPUT_USB; } -#ifdef ADAFRUIT_BLE_ENABLE +#ifdef MODULE_ADAFRUIT_BLE if (adafruit_ble_is_connected()) { - return OUTPUT_ADAFRUIT_BLE; + return OUTPUT_BLUETOOTH; } #endif |