Rename AdafruitBLE
to BluefruitLE
(#16127)
This commit is contained in:
parent
9f4769fbe6
commit
7d685956cc
35 changed files with 109 additions and 109 deletions
|
@ -717,7 +717,7 @@ ifeq ($(strip $(USBPD_ENABLE)), yes)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
BLUETOOTH_ENABLE ?= no
|
BLUETOOTH_ENABLE ?= no
|
||||||
VALID_BLUETOOTH_DRIVER_TYPES := AdafruitBLE RN42 custom
|
VALID_BLUETOOTH_DRIVER_TYPES := BluefruitLE RN42 custom
|
||||||
ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
|
ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
|
||||||
ifeq ($(filter $(strip $(BLUETOOTH_DRIVER)),$(VALID_BLUETOOTH_DRIVER_TYPES)),)
|
ifeq ($(filter $(strip $(BLUETOOTH_DRIVER)),$(VALID_BLUETOOTH_DRIVER_TYPES)),)
|
||||||
$(error "$(BLUETOOTH_DRIVER)" is not a valid Bluetooth driver type)
|
$(error "$(BLUETOOTH_DRIVER)" is not a valid Bluetooth driver type)
|
||||||
|
@ -727,15 +727,15 @@ ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
|
||||||
COMMON_VPATH += $(DRIVER_PATH)/bluetooth
|
COMMON_VPATH += $(DRIVER_PATH)/bluetooth
|
||||||
SRC += outputselect.c
|
SRC += outputselect.c
|
||||||
|
|
||||||
ifeq ($(strip $(BLUETOOTH_DRIVER)), AdafruitBLE)
|
ifeq ($(strip $(BLUETOOTH_DRIVER)), BluefruitLE)
|
||||||
OPT_DEFS += -DMODULE_ADAFRUIT_BLE
|
OPT_DEFS += -DBLUETOOTH_BLUEFRUIT_LE
|
||||||
SRC += analog.c
|
SRC += analog.c
|
||||||
SRC += $(DRIVER_PATH)/bluetooth/adafruit_ble.cpp
|
SRC += $(DRIVER_PATH)/bluetooth/bluefruit_le.cpp
|
||||||
QUANTUM_LIB_SRC += spi_master.c
|
QUANTUM_LIB_SRC += spi_master.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(strip $(BLUETOOTH_DRIVER)), RN42)
|
ifeq ($(strip $(BLUETOOTH_DRIVER)), RN42)
|
||||||
OPT_DEFS += -DMODULE_RN42
|
OPT_DEFS += -DBLUETOOTH_RN42
|
||||||
SRC += $(DRIVER_PATH)/bluetooth/rn42.c
|
SRC += $(DRIVER_PATH)/bluetooth/rn42.c
|
||||||
QUANTUM_LIB_SRC += uart.c
|
QUANTUM_LIB_SRC += uart.c
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -45,7 +45,7 @@
|
||||||
"properties": {
|
"properties": {
|
||||||
"driver": {
|
"driver": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"enum": ["AdafruitBLE", "RN42"]
|
"enum": ["BluefruitLE", "RN42"]
|
||||||
},
|
},
|
||||||
"lto": {"type": "boolean"},
|
"lto": {"type": "boolean"},
|
||||||
}
|
}
|
||||||
|
|
|
@ -429,8 +429,8 @@ Use these to enable or disable building certain features. The more you have enab
|
||||||
* MIDI controls
|
* MIDI controls
|
||||||
* `UNICODE_ENABLE`
|
* `UNICODE_ENABLE`
|
||||||
* Unicode
|
* Unicode
|
||||||
* `BLUETOOTH`
|
* `BLUETOOTH_ENABLE`
|
||||||
* Current options are AdafruitBLE, RN42
|
* Current options are BluefruitLE, RN42
|
||||||
* `SPLIT_KEYBOARD`
|
* `SPLIT_KEYBOARD`
|
||||||
* Enables split keyboard support (dual MCU like the let's split and bakingpy's boards) and includes all necessary files located at quantum/split_common
|
* Enables split keyboard support (dual MCU like the let's split and bakingpy's boards) and includes all necessary files located at quantum/split_common
|
||||||
* `CUSTOM_MATRIX`
|
* `CUSTOM_MATRIX`
|
||||||
|
|
|
@ -7,7 +7,7 @@ Currently Bluetooth support is limited to AVR based chips. For Bluetooth 2.1, QM
|
||||||
|Board |Bluetooth Protocol |Connection Type|rules.mk |Bluetooth Chip|
|
|Board |Bluetooth Protocol |Connection Type|rules.mk |Bluetooth Chip|
|
||||||
|----------------------------------------------------------------|--------------------|---------------|--------------------------------|--------------|
|
|----------------------------------------------------------------|--------------------|---------------|--------------------------------|--------------|
|
||||||
|Roving Networks RN-42 (Sparkfun Bluesmirf) |Bluetooth Classic |UART |`BLUETOOTH_DRIVER = RN42` |RN-42 |
|
|Roving Networks RN-42 (Sparkfun Bluesmirf) |Bluetooth Classic |UART |`BLUETOOTH_DRIVER = RN42` |RN-42 |
|
||||||
|[Bluefruit LE SPI Friend](https://www.adafruit.com/product/2633)|Bluetooth Low Energy|SPI |`BLUETOOTH_DRIVER = AdafruitBLE`|nRF51822 |
|
|[Bluefruit LE SPI Friend](https://www.adafruit.com/product/2633)|Bluetooth Low Energy|SPI |`BLUETOOTH_DRIVER = BluefruitLE`|nRF51822 |
|
||||||
|
|
||||||
Not Supported Yet but possible:
|
Not Supported Yet but possible:
|
||||||
* [Bluefruit LE UART Friend](https://www.adafruit.com/product/2479). [Possible tmk implementation found in](https://github.com/tmk/tmk_keyboard/issues/514)
|
* [Bluefruit LE UART Friend](https://www.adafruit.com/product/2479). [Possible tmk implementation found in](https://github.com/tmk/tmk_keyboard/issues/514)
|
||||||
|
@ -17,9 +17,9 @@ Not Supported Yet but possible:
|
||||||
|
|
||||||
### Adafruit BLE SPI Friend
|
### Adafruit BLE SPI Friend
|
||||||
Currently The only bluetooth chipset supported by QMK is the Adafruit Bluefruit SPI Friend. It's a Nordic nRF51822 based chip running Adafruit's custom firmware. Data is transmitted via Adafruit's SDEP over Hardware SPI. The [Feather 32u4 Bluefruit LE](https://www.adafruit.com/product/2829) is supported as it's an AVR mcu connected via SPI to the Nordic BLE chip with Adafruit firmware. If Building a custom board with the SPI friend it would be easiest to just use the pin selection that the 32u4 feather uses but you can change the pins in the config.h options with the following defines:
|
Currently The only bluetooth chipset supported by QMK is the Adafruit Bluefruit SPI Friend. It's a Nordic nRF51822 based chip running Adafruit's custom firmware. Data is transmitted via Adafruit's SDEP over Hardware SPI. The [Feather 32u4 Bluefruit LE](https://www.adafruit.com/product/2829) is supported as it's an AVR mcu connected via SPI to the Nordic BLE chip with Adafruit firmware. If Building a custom board with the SPI friend it would be easiest to just use the pin selection that the 32u4 feather uses but you can change the pins in the config.h options with the following defines:
|
||||||
* `#define ADAFRUIT_BLE_RST_PIN D4`
|
* `#define BLUEFRUIT_LE_RST_PIN D4`
|
||||||
* `#define ADAFRUIT_BLE_CS_PIN B4`
|
* `#define BLUEFRUIT_LE_CS_PIN B4`
|
||||||
* `#define ADAFRUIT_BLE_IRQ_PIN E6`
|
* `#define BLUEFRUIT_LE_IRQ_PIN E6`
|
||||||
|
|
||||||
A Bluefruit UART friend can be converted to an SPI friend, however this [requires](https://github.com/qmk/qmk_firmware/issues/2274) some reflashing and soldering directly to the MDBT40 chip.
|
A Bluefruit UART friend can be converted to an SPI friend, however this [requires](https://github.com/qmk/qmk_firmware/issues/2274) some reflashing and soldering directly to the MDBT40 chip.
|
||||||
|
|
||||||
|
@ -32,7 +32,7 @@ Add the following to your `rules.mk`:
|
||||||
|
|
||||||
```make
|
```make
|
||||||
BLUETOOTH_ENABLE = yes
|
BLUETOOTH_ENABLE = yes
|
||||||
BLUETOOTH_DRIVER = AdafruitBLE # or RN42
|
BLUETOOTH_DRIVER = BluefruitLE # or RN42
|
||||||
```
|
```
|
||||||
|
|
||||||
## Bluetooth Keycodes
|
## Bluetooth Keycodes
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "adafruit_ble.h"
|
#include "bluefruit_le.h"
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
@ -16,20 +16,20 @@
|
||||||
// These are the pin assignments for the 32u4 boards.
|
// These are the pin assignments for the 32u4 boards.
|
||||||
// You may define them to something else in your config.h
|
// You may define them to something else in your config.h
|
||||||
// if yours is wired up differently.
|
// if yours is wired up differently.
|
||||||
#ifndef ADAFRUIT_BLE_RST_PIN
|
#ifndef BLUEFRUIT_LE_RST_PIN
|
||||||
# define ADAFRUIT_BLE_RST_PIN D4
|
# define BLUEFRUIT_LE_RST_PIN D4
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef ADAFRUIT_BLE_CS_PIN
|
#ifndef BLUEFRUIT_LE_CS_PIN
|
||||||
# define ADAFRUIT_BLE_CS_PIN B4
|
# define BLUEFRUIT_LE_CS_PIN B4
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef ADAFRUIT_BLE_IRQ_PIN
|
#ifndef BLUEFRUIT_LE_IRQ_PIN
|
||||||
# define ADAFRUIT_BLE_IRQ_PIN E6
|
# define BLUEFRUIT_LE_IRQ_PIN E6
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef ADAFRUIT_BLE_SCK_DIVISOR
|
#ifndef BLUEFRUIT_LE_SCK_DIVISOR
|
||||||
# define ADAFRUIT_BLE_SCK_DIVISOR 2 // 4MHz SCK/8MHz CPU, calculated for Feather 32U4 BLE
|
# define BLUEFRUIT_LE_SCK_DIVISOR 2 // 4MHz SCK/8MHz CPU, calculated for Feather 32U4 BLE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define SAMPLE_BATTERY
|
#define SAMPLE_BATTERY
|
||||||
|
@ -143,7 +143,7 @@ static bool at_command_P(const char *cmd, char *resp, uint16_t resplen, bool ver
|
||||||
|
|
||||||
// Send a single SDEP packet
|
// Send a single SDEP packet
|
||||||
static bool sdep_send_pkt(const struct sdep_msg *msg, uint16_t timeout) {
|
static bool sdep_send_pkt(const struct sdep_msg *msg, uint16_t timeout) {
|
||||||
spi_start(ADAFRUIT_BLE_CS_PIN, false, 0, ADAFRUIT_BLE_SCK_DIVISOR);
|
spi_start(BLUEFRUIT_LE_CS_PIN, false, 0, BLUEFRUIT_LE_SCK_DIVISOR);
|
||||||
uint16_t timerStart = timer_read();
|
uint16_t timerStart = timer_read();
|
||||||
bool success = false;
|
bool success = false;
|
||||||
bool ready = false;
|
bool ready = false;
|
||||||
|
@ -157,7 +157,7 @@ static bool sdep_send_pkt(const struct sdep_msg *msg, uint16_t timeout) {
|
||||||
// Release it and let it initialize
|
// Release it and let it initialize
|
||||||
spi_stop();
|
spi_stop();
|
||||||
wait_us(SdepBackOff);
|
wait_us(SdepBackOff);
|
||||||
spi_start(ADAFRUIT_BLE_CS_PIN, false, 0, ADAFRUIT_BLE_SCK_DIVISOR);
|
spi_start(BLUEFRUIT_LE_CS_PIN, false, 0, BLUEFRUIT_LE_SCK_DIVISOR);
|
||||||
} while (timer_elapsed(timerStart) < timeout);
|
} while (timer_elapsed(timerStart) < timeout);
|
||||||
|
|
||||||
if (ready) {
|
if (ready) {
|
||||||
|
@ -190,7 +190,7 @@ static bool sdep_recv_pkt(struct sdep_msg *msg, uint16_t timeout) {
|
||||||
bool ready = false;
|
bool ready = false;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
ready = readPin(ADAFRUIT_BLE_IRQ_PIN);
|
ready = readPin(BLUEFRUIT_LE_IRQ_PIN);
|
||||||
if (ready) {
|
if (ready) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -198,7 +198,7 @@ static bool sdep_recv_pkt(struct sdep_msg *msg, uint16_t timeout) {
|
||||||
} while (timer_elapsed(timerStart) < timeout);
|
} while (timer_elapsed(timerStart) < timeout);
|
||||||
|
|
||||||
if (ready) {
|
if (ready) {
|
||||||
spi_start(ADAFRUIT_BLE_CS_PIN, false, 0, ADAFRUIT_BLE_SCK_DIVISOR);
|
spi_start(BLUEFRUIT_LE_CS_PIN, false, 0, BLUEFRUIT_LE_SCK_DIVISOR);
|
||||||
|
|
||||||
do {
|
do {
|
||||||
// Read the command type, waiting for the data to be ready
|
// Read the command type, waiting for the data to be ready
|
||||||
|
@ -207,7 +207,7 @@ static bool sdep_recv_pkt(struct sdep_msg *msg, uint16_t timeout) {
|
||||||
// Release it and let it initialize
|
// Release it and let it initialize
|
||||||
spi_stop();
|
spi_stop();
|
||||||
wait_us(SdepBackOff);
|
wait_us(SdepBackOff);
|
||||||
spi_start(ADAFRUIT_BLE_CS_PIN, false, 0, ADAFRUIT_BLE_SCK_DIVISOR);
|
spi_start(BLUEFRUIT_LE_CS_PIN, false, 0, BLUEFRUIT_LE_SCK_DIVISOR);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -233,7 +233,7 @@ static void resp_buf_read_one(bool greedy) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (readPin(ADAFRUIT_BLE_IRQ_PIN)) {
|
if (readPin(BLUEFRUIT_LE_IRQ_PIN)) {
|
||||||
struct sdep_msg msg;
|
struct sdep_msg msg;
|
||||||
|
|
||||||
again:
|
again:
|
||||||
|
@ -244,7 +244,7 @@ static void resp_buf_read_one(bool greedy) {
|
||||||
dprintf("recv latency %dms\n", TIMER_DIFF_16(timer_read(), last_send));
|
dprintf("recv latency %dms\n", TIMER_DIFF_16(timer_read(), last_send));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (greedy && resp_buf.peek(last_send) && readPin(ADAFRUIT_BLE_IRQ_PIN)) {
|
if (greedy && resp_buf.peek(last_send) && readPin(BLUEFRUIT_LE_IRQ_PIN)) {
|
||||||
goto again;
|
goto again;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -295,16 +295,16 @@ static bool ble_init(void) {
|
||||||
state.configured = false;
|
state.configured = false;
|
||||||
state.is_connected = false;
|
state.is_connected = false;
|
||||||
|
|
||||||
setPinInput(ADAFRUIT_BLE_IRQ_PIN);
|
setPinInput(BLUEFRUIT_LE_IRQ_PIN);
|
||||||
|
|
||||||
spi_init();
|
spi_init();
|
||||||
|
|
||||||
// Perform a hardware reset
|
// Perform a hardware reset
|
||||||
setPinOutput(ADAFRUIT_BLE_RST_PIN);
|
setPinOutput(BLUEFRUIT_LE_RST_PIN);
|
||||||
writePinHigh(ADAFRUIT_BLE_RST_PIN);
|
writePinHigh(BLUEFRUIT_LE_RST_PIN);
|
||||||
writePinLow(ADAFRUIT_BLE_RST_PIN);
|
writePinLow(BLUEFRUIT_LE_RST_PIN);
|
||||||
wait_ms(10);
|
wait_ms(10);
|
||||||
writePinHigh(ADAFRUIT_BLE_RST_PIN);
|
writePinHigh(BLUEFRUIT_LE_RST_PIN);
|
||||||
|
|
||||||
wait_ms(1000); // Give it a second to initialize
|
wait_ms(1000); // Give it a second to initialize
|
||||||
|
|
||||||
|
@ -424,9 +424,9 @@ bool at_command_P(const char *cmd, char *resp, uint16_t resplen, bool verbose) {
|
||||||
return at_command(cmdbuf, resp, resplen, verbose);
|
return at_command(cmdbuf, resp, resplen, verbose);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool adafruit_ble_is_connected(void) { return state.is_connected; }
|
bool bluefruit_le_is_connected(void) { return state.is_connected; }
|
||||||
|
|
||||||
bool adafruit_ble_enable_keyboard(void) {
|
bool bluefruit_le_enable_keyboard(void) {
|
||||||
char resbuf[128];
|
char resbuf[128];
|
||||||
|
|
||||||
if (!state.initialized && !ble_init()) {
|
if (!state.initialized && !ble_init()) {
|
||||||
|
@ -498,16 +498,16 @@ static void set_connected(bool connected) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void adafruit_ble_task(void) {
|
void bluefruit_le_task(void) {
|
||||||
char resbuf[48];
|
char resbuf[48];
|
||||||
|
|
||||||
if (!state.configured && !adafruit_ble_enable_keyboard()) {
|
if (!state.configured && !bluefruit_le_enable_keyboard()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
resp_buf_read_one(true);
|
resp_buf_read_one(true);
|
||||||
send_buf_send_one(SdepShortTimeout);
|
send_buf_send_one(SdepShortTimeout);
|
||||||
|
|
||||||
if (resp_buf.empty() && (state.event_flags & UsingEvents) && readPin(ADAFRUIT_BLE_IRQ_PIN)) {
|
if (resp_buf.empty() && (state.event_flags & UsingEvents) && readPin(BLUEFRUIT_LE_IRQ_PIN)) {
|
||||||
// Must be an event update
|
// Must be an event update
|
||||||
if (at_command_P(PSTR("AT+EVENTSTATUS"), resbuf, sizeof(resbuf))) {
|
if (at_command_P(PSTR("AT+EVENTSTATUS"), resbuf, sizeof(resbuf))) {
|
||||||
uint32_t mask = strtoul(resbuf, NULL, 16);
|
uint32_t mask = strtoul(resbuf, NULL, 16);
|
||||||
|
@ -609,7 +609,7 @@ static bool process_queue_item(struct queue_item *item, uint16_t timeout) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void adafruit_ble_send_keys(uint8_t hid_modifier_mask, uint8_t *keys, uint8_t nkeys) {
|
void bluefruit_le_send_keys(uint8_t hid_modifier_mask, uint8_t *keys, uint8_t nkeys) {
|
||||||
struct queue_item item;
|
struct queue_item item;
|
||||||
bool didWait = false;
|
bool didWait = false;
|
||||||
|
|
||||||
|
@ -643,7 +643,7 @@ void adafruit_ble_send_keys(uint8_t hid_modifier_mask, uint8_t *keys, uint8_t nk
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void adafruit_ble_send_consumer_key(uint16_t usage) {
|
void bluefruit_le_send_consumer_key(uint16_t usage) {
|
||||||
struct queue_item item;
|
struct queue_item item;
|
||||||
|
|
||||||
item.queue_type = QTConsumer;
|
item.queue_type = QTConsumer;
|
||||||
|
@ -655,7 +655,7 @@ void adafruit_ble_send_consumer_key(uint16_t usage) {
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef MOUSE_ENABLE
|
#ifdef MOUSE_ENABLE
|
||||||
void adafruit_ble_send_mouse_move(int8_t x, int8_t y, int8_t scroll, int8_t pan, uint8_t buttons) {
|
void bluefruit_le_send_mouse_move(int8_t x, int8_t y, int8_t scroll, int8_t pan, uint8_t buttons) {
|
||||||
struct queue_item item;
|
struct queue_item item;
|
||||||
|
|
||||||
item.queue_type = QTMouseMove;
|
item.queue_type = QTMouseMove;
|
||||||
|
@ -671,9 +671,9 @@ void adafruit_ble_send_mouse_move(int8_t x, int8_t y, int8_t scroll, int8_t pan,
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
uint32_t adafruit_ble_read_battery_voltage(void) { return state.vbat; }
|
uint32_t bluefruit_le_read_battery_voltage(void) { return state.vbat; }
|
||||||
|
|
||||||
bool adafruit_ble_set_mode_leds(bool on) {
|
bool bluefruit_le_set_mode_leds(bool on) {
|
||||||
if (!state.configured) {
|
if (!state.configured) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -689,7 +689,7 @@ bool adafruit_ble_set_mode_leds(bool on) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// https://learn.adafruit.com/adafruit-feather-32u4-bluefruit-le/ble-generic#at-plus-blepowerlevel
|
// https://learn.adafruit.com/adafruit-feather-32u4-bluefruit-le/ble-generic#at-plus-blepowerlevel
|
||||||
bool adafruit_ble_set_power_level(int8_t level) {
|
bool bluefruit_le_set_power_level(int8_t level) {
|
||||||
char cmd[46];
|
char cmd[46];
|
||||||
if (!state.configured) {
|
if (!state.configured) {
|
||||||
return false;
|
return false;
|
|
@ -16,43 +16,43 @@ extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Instruct the module to enable HID keyboard support and reset */
|
/* Instruct the module to enable HID keyboard support and reset */
|
||||||
extern bool adafruit_ble_enable_keyboard(void);
|
extern bool bluefruit_le_enable_keyboard(void);
|
||||||
|
|
||||||
/* Query to see if the BLE module is connected */
|
/* Query to see if the BLE module is connected */
|
||||||
extern bool adafruit_ble_query_is_connected(void);
|
extern bool bluefruit_le_query_is_connected(void);
|
||||||
|
|
||||||
/* Returns true if we believe that the BLE module is connected.
|
/* Returns true if we believe that the BLE module is connected.
|
||||||
* This uses our cached understanding that is maintained by
|
* This uses our cached understanding that is maintained by
|
||||||
* calling ble_task() periodically. */
|
* calling ble_task() periodically. */
|
||||||
extern bool adafruit_ble_is_connected(void);
|
extern bool bluefruit_le_is_connected(void);
|
||||||
|
|
||||||
/* Call this periodically to process BLE-originated things */
|
/* Call this periodically to process BLE-originated things */
|
||||||
extern void adafruit_ble_task(void);
|
extern void bluefruit_le_task(void);
|
||||||
|
|
||||||
/* Generates keypress events for a set of keys.
|
/* Generates keypress events for a set of keys.
|
||||||
* The hid modifier mask specifies the state of the modifier keys for
|
* The hid modifier mask specifies the state of the modifier keys for
|
||||||
* this set of keys.
|
* this set of keys.
|
||||||
* Also sends a key release indicator, so that the keys do not remain
|
* Also sends a key release indicator, so that the keys do not remain
|
||||||
* held down. */
|
* held down. */
|
||||||
extern void adafruit_ble_send_keys(uint8_t hid_modifier_mask, uint8_t *keys, uint8_t nkeys);
|
extern void bluefruit_le_send_keys(uint8_t hid_modifier_mask, uint8_t *keys, uint8_t nkeys);
|
||||||
|
|
||||||
/* Send a consumer usage.
|
/* Send a consumer usage.
|
||||||
* (milliseconds) */
|
* (milliseconds) */
|
||||||
extern void adafruit_ble_send_consumer_key(uint16_t usage);
|
extern void bluefruit_le_send_consumer_key(uint16_t usage);
|
||||||
|
|
||||||
#ifdef MOUSE_ENABLE
|
#ifdef MOUSE_ENABLE
|
||||||
/* Send a mouse/wheel movement report.
|
/* Send a mouse/wheel movement report.
|
||||||
* The parameters are signed and indicate positive or negative direction
|
* The parameters are signed and indicate positive or negative direction
|
||||||
* change. */
|
* change. */
|
||||||
extern void adafruit_ble_send_mouse_move(int8_t x, int8_t y, int8_t scroll, int8_t pan, uint8_t buttons);
|
extern void bluefruit_le_send_mouse_move(int8_t x, int8_t y, int8_t scroll, int8_t pan, uint8_t buttons);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Compute battery voltage by reading an analog pin.
|
/* Compute battery voltage by reading an analog pin.
|
||||||
* Returns the integer number of millivolts */
|
* Returns the integer number of millivolts */
|
||||||
extern uint32_t adafruit_ble_read_battery_voltage(void);
|
extern uint32_t bluefruit_le_read_battery_voltage(void);
|
||||||
|
|
||||||
extern bool adafruit_ble_set_mode_leds(bool on);
|
extern bool bluefruit_le_set_mode_leds(bool on);
|
||||||
extern bool adafruit_ble_set_power_level(int8_t level);
|
extern bool bluefruit_le_set_power_level(int8_t level);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
|
@ -18,8 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
# include "lufa.h"
|
# include "lufa.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef MODULE_ADAFRUIT_BLE
|
#ifdef BLUETOOTH_BLUEFRUIT_LE
|
||||||
# include "adafruit_ble.h"
|
# include "bluefruit_le.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
uint8_t desired_output = OUTPUT_DEFAULT;
|
uint8_t desired_output = OUTPUT_DEFAULT;
|
||||||
|
@ -54,8 +54,8 @@ uint8_t auto_detect_output(void) {
|
||||||
return OUTPUT_USB;
|
return OUTPUT_USB;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef MODULE_ADAFRUIT_BLE
|
#ifdef BLUETOOTH_BLUEFRUIT_LE
|
||||||
if (adafruit_ble_is_connected()) {
|
if (bluefruit_le_is_connected()) {
|
||||||
return OUTPUT_BLUETOOTH;
|
return OUTPUT_BLUETOOTH;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -20,7 +20,7 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
||||||
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
|
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
|
||||||
AUDIO_ENABLE = no # Audio output
|
AUDIO_ENABLE = no # Audio output
|
||||||
BLUETOOTH_ENABLE = yes
|
BLUETOOTH_ENABLE = yes
|
||||||
BLUETOOTH_DRIVER = AdafruitBLE
|
BLUETOOTH_DRIVER = BluefruitLE
|
||||||
OLED_ENABLE = yes
|
OLED_ENABLE = yes
|
||||||
OLED_DRIVER = SSD1306
|
OLED_DRIVER = SSD1306
|
||||||
ENCODER_ENABLE = yes
|
ENCODER_ENABLE = yes
|
||||||
|
|
|
@ -5,5 +5,5 @@ F_CPU = 8000000
|
||||||
# change yes to no to disable
|
# change yes to no to disable
|
||||||
#
|
#
|
||||||
BLUETOOTH_ENABLE = yes
|
BLUETOOTH_ENABLE = yes
|
||||||
BLUETOOTH_DRIVER = AdafruitBLE
|
BLUETOOTH_DRIVER = BluefruitLE
|
||||||
BACKLIGHT_ENABLE = no
|
BACKLIGHT_ENABLE = no
|
||||||
|
|
|
@ -11,5 +11,5 @@ BOOTLOADER = caterina
|
||||||
# change yes to no to disable
|
# change yes to no to disable
|
||||||
#
|
#
|
||||||
BLUETOOTH_ENABLE = yes
|
BLUETOOTH_ENABLE = yes
|
||||||
BLUETOOTH_DRIVER = AdafruitBLE
|
BLUETOOTH_DRIVER = BluefruitLE
|
||||||
CONSOLE_ENABLE = no
|
CONSOLE_ENABLE = no
|
||||||
|
|
|
@ -45,8 +45,8 @@ extern keymap_config_t keymap_config;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef BLUETOOTH_ENABLE
|
#ifdef BLUETOOTH_ENABLE
|
||||||
#ifdef MODULE_ADAFRUIT_BLE
|
#ifdef BLUETOOTH_BLUEFRUIT_LE
|
||||||
#include "adafruit_ble.h"
|
#include "bluefruit_le.h"
|
||||||
#else
|
#else
|
||||||
#include "bluetooth.h"
|
#include "bluetooth.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -319,7 +319,7 @@ int main(void)
|
||||||
setup_usb();
|
setup_usb();
|
||||||
sei();
|
sei();
|
||||||
|
|
||||||
#if defined(MODULE_ADAFRUIT_EZKEY) || defined(MODULE_RN42)
|
#if defined(BLUETOOTH_RN42)
|
||||||
serial_init();
|
serial_init();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ This is a port of the original M0110 converter from TMK to QMK. The original con
|
||||||
|
|
||||||
## Enabling Bluetooth for the Adafruit Feather 32U4 BLE
|
## Enabling Bluetooth for the Adafruit Feather 32U4 BLE
|
||||||
|
|
||||||
Simply add `BLUETOOTH = AdafruitBLE` to your `rules.mk` file. This enables code specifically for the Adafruit Feather 32U4 BLE. If enabled, the device will use the `PRODUCT` value from `config.h` for the device name displayed by the Feather on host devices. You can simply change these values to change the device name.
|
Simply add `BLUETOOTH = BluefruitLE` to your `rules.mk` file. This enables code specifically for the Adafruit Feather 32U4 BLE. If enabled, the device will use the `PRODUCT` value from `config.h` for the device name displayed by the Feather on host devices. You can simply change these values to change the device name.
|
||||||
|
|
||||||
|
|
||||||
## Pins
|
## Pins
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
#define PRODUCT QMK BLE Adapter
|
#define PRODUCT QMK BLE Adapter
|
||||||
|
|
||||||
// Turn off the mode leds on the BLE module
|
// Turn off the mode leds on the BLE module
|
||||||
#define ADAFRUIT_BLE_ENABLE_MODE_LEDS 0
|
#define BLUEFRUIT_LE_ENABLE_MODE_LEDS 0
|
||||||
#define ADAFRUIT_BLE_ENABLE_POWER_LED 0
|
#define BLUEFRUIT_LE_ENABLE_POWER_LED 0
|
||||||
|
|
||||||
#define NO_ACTION_MACRO
|
#define NO_ACTION_MACRO
|
||||||
#define NO_ACTION_FUNCTION
|
#define NO_ACTION_FUNCTION
|
||||||
|
|
|
@ -12,6 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
|
||||||
AUDIO_ENABLE = no # Audio output
|
AUDIO_ENABLE = no # Audio output
|
||||||
|
|
||||||
BLUETOOTH_ENABLE = yes
|
BLUETOOTH_ENABLE = yes
|
||||||
BLUETOOTH_DRIVER = AdafruitBLE
|
BLUETOOTH_DRIVER = BluefruitLE
|
||||||
|
|
||||||
LTO_ENABLE = yes
|
LTO_ENABLE = yes
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
A 40 percent keyboard dosa40rgb Bluetooth Low Energy
|
A 40 percent keyboard dosa40rgb Bluetooth Low Energy
|
||||||
|
|
||||||
* Keyboard Maintainer: [DTIsaac](https://github.com/daotakisaac)
|
* Keyboard Maintainer: [DTIsaac](https://github.com/daotakisaac)
|
||||||
* Hardware Supported: ATmega32U4 + AdafruitBLE SPI
|
* Hardware Supported: ATmega32U4 + Bluefruit LE SPI
|
||||||
|
|
||||||
Make example for this keyboard (after setting up your build environment):
|
Make example for this keyboard (after setting up your build environment):
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
||||||
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
|
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
|
||||||
AUDIO_ENABLE = no # Audio output
|
AUDIO_ENABLE = no # Audio output
|
||||||
BLUETOOTH_ENABLE = yes # Enable Bluetooth
|
BLUETOOTH_ENABLE = yes # Enable Bluetooth
|
||||||
BLUETOOTH_DRIVER = AdafruitBLE
|
BLUETOOTH_DRIVER = BluefruitLE
|
||||||
RGB_MATRIX_ENABLE = yes
|
RGB_MATRIX_ENABLE = yes
|
||||||
RGB_MATRIX_DRIVER = WS2812
|
RGB_MATRIX_DRIVER = WS2812
|
||||||
|
|
||||||
|
|
|
@ -21,4 +21,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
|
||||||
AUDIO_ENABLE = no # Audio output
|
AUDIO_ENABLE = no # Audio output
|
||||||
|
|
||||||
BLUETOOTH_ENABLE = yes
|
BLUETOOTH_ENABLE = yes
|
||||||
BLUETOOTH_DRIVER = AdafruitBLE
|
BLUETOOTH_DRIVER = BluefruitLE
|
||||||
|
|
|
@ -21,4 +21,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
|
||||||
AUDIO_ENABLE = no # Audio output
|
AUDIO_ENABLE = no # Audio output
|
||||||
ENCODER_ENABLE = no
|
ENCODER_ENABLE = no
|
||||||
BLUETOOTH_ENABLE = yes
|
BLUETOOTH_ENABLE = yes
|
||||||
BLUETOOTH_DRIVER = AdafruitBLE
|
BLUETOOTH_DRIVER = BluefruitLE
|
||||||
|
|
|
@ -20,6 +20,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
||||||
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
|
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
|
||||||
AUDIO_ENABLE = no # Audio output
|
AUDIO_ENABLE = no # Audio output
|
||||||
BLUETOOTH_ENABLE = yes
|
BLUETOOTH_ENABLE = yes
|
||||||
BLUETOOTH_DRIVER = AdafruitBLE
|
BLUETOOTH_DRIVER = BluefruitLE
|
||||||
|
|
||||||
LAYOUTS = 60_tsangan_hhkb
|
LAYOUTS = 60_tsangan_hhkb
|
||||||
|
|
|
@ -22,4 +22,4 @@ AUDIO_ENABLE = no # This can be enabled if a speaker is connected to t
|
||||||
RGBLIGHT_ENABLE = no # This can be enabled if a ws2812 strip is connected to the expansion port.
|
RGBLIGHT_ENABLE = no # This can be enabled if a ws2812 strip is connected to the expansion port.
|
||||||
|
|
||||||
BLUETOOTH_ENABLE = yes
|
BLUETOOTH_ENABLE = yes
|
||||||
BLUETOOTH_DRIVER = AdafruitBLE
|
BLUETOOTH_DRIVER = BluefruitLE
|
||||||
|
|
|
@ -137,7 +137,7 @@ enum planck_keycodes {
|
||||||
#ifndef FAUXCLICKY_ENABLE
|
#ifndef FAUXCLICKY_ENABLE
|
||||||
FC_TOG,
|
FC_TOG,
|
||||||
#endif
|
#endif
|
||||||
#ifndef MODULE_ADAFRUIT_BLE
|
#ifndef BLUETOOTH_BLUEFRUIT_LE
|
||||||
OUT_BT,
|
OUT_BT,
|
||||||
#endif
|
#endif
|
||||||
RGBDEMO,
|
RGBDEMO,
|
||||||
|
@ -1261,7 +1261,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void set_output_user(uint8_t output) {
|
void set_output_user(uint8_t output) {
|
||||||
#ifdef MODULE_ADAFRUIT_BLE
|
#ifdef BLUETOOTH_BLUEFRUIT_LE
|
||||||
switch(output) {
|
switch(output) {
|
||||||
case OUTPUT_USB:
|
case OUTPUT_USB:
|
||||||
led_set_output_usb();
|
led_set_output_usb();
|
||||||
|
@ -1285,7 +1285,7 @@ void matrix_init_user() {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// auto detect output on init
|
// auto detect output on init
|
||||||
#ifdef MODULE_ADAFRUIT_BLE
|
#ifdef BLUETOOTH_BLUEFRUIT_LE
|
||||||
uint8_t output = auto_detect_output();
|
uint8_t output = auto_detect_output();
|
||||||
if (output == OUTPUT_USB) {
|
if (output == OUTPUT_USB) {
|
||||||
set_output(OUTPUT_USB);
|
set_output(OUTPUT_USB);
|
||||||
|
|
|
@ -140,7 +140,7 @@ enum planck_keycodes {
|
||||||
#ifndef FAUXCLICKY_ENABLE
|
#ifndef FAUXCLICKY_ENABLE
|
||||||
FC_TOG,
|
FC_TOG,
|
||||||
#endif
|
#endif
|
||||||
#ifndef MODULE_ADAFRUIT_BLE
|
#ifndef BLUETOOTH_BLUEFRUIT_LE
|
||||||
OUT_BT,
|
OUT_BT,
|
||||||
#endif
|
#endif
|
||||||
RGBDEMO,
|
RGBDEMO,
|
||||||
|
@ -1264,7 +1264,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void set_output_user(uint8_t output) {
|
void set_output_user(uint8_t output) {
|
||||||
#ifdef MODULE_ADAFRUIT_BLE
|
#ifdef BLUETOOTH_BLUEFRUIT_LE
|
||||||
switch(output) {
|
switch(output) {
|
||||||
case OUTPUT_USB:
|
case OUTPUT_USB:
|
||||||
led_set_output_usb();
|
led_set_output_usb();
|
||||||
|
@ -1288,7 +1288,7 @@ void matrix_init_user() {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// auto detect output on init
|
// auto detect output on init
|
||||||
#ifdef MODULE_ADAFRUIT_BLE
|
#ifdef BLUETOOTH_BLUEFRUIT_LE
|
||||||
uint8_t output = auto_detect_output();
|
uint8_t output = auto_detect_output();
|
||||||
if (output == OUTPUT_USB) {
|
if (output == OUTPUT_USB) {
|
||||||
set_output(OUTPUT_USB);
|
set_output(OUTPUT_USB);
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#include "timer.h"
|
#include "timer.h"
|
||||||
#include "matrix.h"
|
#include "matrix.h"
|
||||||
#include "musical_notes.h"
|
#include "musical_notes.h"
|
||||||
#include "adafruit_ble.h"
|
#include "bluefruit_le.h"
|
||||||
|
|
||||||
float fauxclicky_pressed_note[2] = MUSICAL_NOTE(_A4, 0.0625);
|
float fauxclicky_pressed_note[2] = MUSICAL_NOTE(_A4, 0.0625);
|
||||||
float fauxclicky_released_note[2] = MUSICAL_NOTE(_A4, 0.0625);
|
float fauxclicky_released_note[2] = MUSICAL_NOTE(_A4, 0.0625);
|
||||||
|
@ -12,7 +12,7 @@ float fauxclicky_beep_note[2] = MUSICAL_NOTE(_C6, 0.25);
|
||||||
// cubic fit {3.3, 0}, {3.5, 2.9}, {3.6, 5}, {3.7, 8.6}, {3.8, 36}, {3.9, 62}, {4.0, 73}, {4.05, 83}, {4.1, 89}, {4.15, 94}, {4.2, 100}
|
// cubic fit {3.3, 0}, {3.5, 2.9}, {3.6, 5}, {3.7, 8.6}, {3.8, 36}, {3.9, 62}, {4.0, 73}, {4.05, 83}, {4.1, 89}, {4.15, 94}, {4.2, 100}
|
||||||
|
|
||||||
uint8_t battery_level(void) {
|
uint8_t battery_level(void) {
|
||||||
float voltage = adafruit_ble_read_battery_voltage() * 2 * 3.3 / 1024;
|
float voltage = bluefruit_le_read_battery_voltage() * 2 * 3.3 / 1024;
|
||||||
if (voltage < MIN_VOLTAGE) return 0;
|
if (voltage < MIN_VOLTAGE) return 0;
|
||||||
if (voltage > MAX_VOLTAGE) return 255;
|
if (voltage > MAX_VOLTAGE) return 255;
|
||||||
return (voltage - MIN_VOLTAGE) / (MAX_VOLTAGE - MIN_VOLTAGE) * 255;
|
return (voltage - MIN_VOLTAGE) / (MAX_VOLTAGE - MIN_VOLTAGE) * 255;
|
||||||
|
|
|
@ -23,7 +23,7 @@ PS2_MOUSE_ENABLE = yes
|
||||||
PS2_USE_INT = yes
|
PS2_USE_INT = yes
|
||||||
CUSTOM_MATRIX = yes
|
CUSTOM_MATRIX = yes
|
||||||
BLUETOOTH_ENABLE = yes
|
BLUETOOTH_ENABLE = yes
|
||||||
BLUETOOTH_DRIVER = AdafruitBLE
|
BLUETOOTH_DRIVER = BluefruitLE
|
||||||
|
|
||||||
SRC += ws2812.c
|
SRC += ws2812.c
|
||||||
SRC += rgbsps.c
|
SRC += rgbsps.c
|
||||||
|
|
|
@ -22,7 +22,7 @@ AUDIO_ENABLE = no # Audio output
|
||||||
UNICODE_ENABLE = yes
|
UNICODE_ENABLE = yes
|
||||||
CUSTOM_MATRIX = yes
|
CUSTOM_MATRIX = yes
|
||||||
BLUETOOTH_ENABLE = yes
|
BLUETOOTH_ENABLE = yes
|
||||||
BLUETOOTH_DRIVER = AdafruitBLE
|
BLUETOOTH_DRIVER = BluefruitLE
|
||||||
|
|
||||||
SRC += matrix.c
|
SRC += matrix.c
|
||||||
QUANTUM_LIB_SRC += i2c_master.c
|
QUANTUM_LIB_SRC += i2c_master.c
|
||||||
|
|
|
@ -20,4 +20,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
||||||
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
|
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
|
||||||
AUDIO_ENABLE = no # Audio output
|
AUDIO_ENABLE = no # Audio output
|
||||||
BLUETOOTH_ENABLE = yes
|
BLUETOOTH_ENABLE = yes
|
||||||
BLUETOOTH_DRIVER = AdafruitBLE
|
BLUETOOTH_DRIVER = BluefruitLE
|
||||||
|
|
|
@ -20,6 +20,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
||||||
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
|
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
|
||||||
AUDIO_ENABLE = no # Audio output
|
AUDIO_ENABLE = no # Audio output
|
||||||
BLUETOOTH_ENABLE = yes
|
BLUETOOTH_ENABLE = yes
|
||||||
BLUETOOTH_DRIVER = AdafruitBLE
|
BLUETOOTH_DRIVER = BluefruitLE
|
||||||
|
|
||||||
LAYOUTS = planck_mit
|
LAYOUTS = planck_mit
|
||||||
|
|
|
@ -20,4 +20,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
||||||
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
|
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
|
||||||
AUDIO_ENABLE = no # Audio output
|
AUDIO_ENABLE = no # Audio output
|
||||||
BLUETOOTH_ENABLE = yes
|
BLUETOOTH_ENABLE = yes
|
||||||
BLUETOOTH_DRIVER = AdafruitBLE
|
BLUETOOTH_DRIVER = BluefruitLE
|
||||||
|
|
|
@ -21,7 +21,7 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
|
||||||
AUDIO_ENABLE = no # Audio output
|
AUDIO_ENABLE = no # Audio output
|
||||||
|
|
||||||
BLUETOOTH_ENABLE = yes
|
BLUETOOTH_ENABLE = yes
|
||||||
BLUETOOTH_DRIVER = AdafruitBLE
|
BLUETOOTH_DRIVER = BluefruitLE
|
||||||
OLED_ENABLE = yes
|
OLED_ENABLE = yes
|
||||||
OLED_DRIVER = SSD1306
|
OLED_DRIVER = SSD1306
|
||||||
ENCODER_ENABLE = yes
|
ENCODER_ENABLE = yes
|
||||||
|
|
|
@ -2,4 +2,4 @@
|
||||||
F_CPU = 8000000
|
F_CPU = 8000000
|
||||||
|
|
||||||
BLUETOOTH_ENABLE = yes
|
BLUETOOTH_ENABLE = yes
|
||||||
BLUETOOTH_DRIVER = AdafruitBLE
|
BLUETOOTH_DRIVER = BluefruitLE
|
||||||
|
|
|
@ -22,6 +22,6 @@ AUDIO_ENABLE = no # Audio output
|
||||||
CUSTOM_MATRIX = yes
|
CUSTOM_MATRIX = yes
|
||||||
DEBUG_ENABLE = yes
|
DEBUG_ENABLE = yes
|
||||||
BLUETOOTH_ENABLE = yes
|
BLUETOOTH_ENABLE = yes
|
||||||
BLUETOOTH_DRIVER = AdafruitBLE
|
BLUETOOTH_DRIVER = BluefruitLE
|
||||||
|
|
||||||
SRC += matrix.c mcp23017.c
|
SRC += matrix.c mcp23017.c
|
||||||
|
|
|
@ -20,7 +20,7 @@ BACKLIGHT_ENABLE = no # Custom backlighting code is used, so this should not b
|
||||||
AUDIO_ENABLE = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below
|
AUDIO_ENABLE = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below
|
||||||
RGBLIGHT_ENABLE = no # This can be enabled if a ws2812 strip is connected to the expansion port.
|
RGBLIGHT_ENABLE = no # This can be enabled if a ws2812 strip is connected to the expansion port.
|
||||||
BLUETOOTH_ENABLE = yes
|
BLUETOOTH_ENABLE = yes
|
||||||
BLUETOOTH_DRIVER = AdafruitBLE
|
BLUETOOTH_DRIVER = BluefruitLE
|
||||||
|
|
||||||
LAYOUTS = ortho_4x12 planck_mit
|
LAYOUTS = ortho_4x12 planck_mit
|
||||||
|
|
||||||
|
|
|
@ -20,4 +20,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
||||||
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
|
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
|
||||||
AUDIO_ENABLE = no # Audio output
|
AUDIO_ENABLE = no # Audio output
|
||||||
BLUETOOTH_ENABLE = yes
|
BLUETOOTH_ENABLE = yes
|
||||||
BLUETOOTH_DRIVER = AdafruitBLE
|
BLUETOOTH_DRIVER = BluefruitLE
|
||||||
|
|
|
@ -67,9 +67,9 @@ extern keymap_config_t keymap_config;
|
||||||
|
|
||||||
#ifdef BLUETOOTH_ENABLE
|
#ifdef BLUETOOTH_ENABLE
|
||||||
# include "outputselect.h"
|
# include "outputselect.h"
|
||||||
# ifdef MODULE_ADAFRUIT_BLE
|
# ifdef BLUETOOTH_BLUEFRUIT_LE
|
||||||
# include "adafruit_ble.h"
|
# include "bluefruit_le.h"
|
||||||
# elif MODULE_RN42
|
# elif BLUETOOTH_RN42
|
||||||
# include "rn42.h"
|
# include "rn42.h"
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
@ -645,9 +645,9 @@ static void send_keyboard(report_keyboard_t *report) {
|
||||||
|
|
||||||
#ifdef BLUETOOTH_ENABLE
|
#ifdef BLUETOOTH_ENABLE
|
||||||
if (where_to_send() == OUTPUT_BLUETOOTH) {
|
if (where_to_send() == OUTPUT_BLUETOOTH) {
|
||||||
# ifdef MODULE_ADAFRUIT_BLE
|
# ifdef BLUETOOTH_BLUEFRUIT_LE
|
||||||
adafruit_ble_send_keys(report->mods, report->keys, sizeof(report->keys));
|
bluefruit_le_send_keys(report->mods, report->keys, sizeof(report->keys));
|
||||||
# elif MODULE_RN42
|
# elif BLUETOOTH_RN42
|
||||||
rn42_send_keyboard(report);
|
rn42_send_keyboard(report);
|
||||||
# endif
|
# endif
|
||||||
return;
|
return;
|
||||||
|
@ -691,10 +691,10 @@ static void send_mouse(report_mouse_t *report) {
|
||||||
|
|
||||||
# ifdef BLUETOOTH_ENABLE
|
# ifdef BLUETOOTH_ENABLE
|
||||||
if (where_to_send() == OUTPUT_BLUETOOTH) {
|
if (where_to_send() == OUTPUT_BLUETOOTH) {
|
||||||
# ifdef MODULE_ADAFRUIT_BLE
|
# ifdef BLUETOOTH_BLUEFRUIT_LE
|
||||||
// FIXME: mouse buttons
|
// FIXME: mouse buttons
|
||||||
adafruit_ble_send_mouse_move(report->x, report->y, report->v, report->h, report->buttons);
|
bluefruit_le_send_mouse_move(report->x, report->y, report->v, report->h, report->buttons);
|
||||||
# elif MODULE_RN42
|
# elif BLUETOOTH_RN42
|
||||||
rn42_send_mouse(report);
|
rn42_send_mouse(report);
|
||||||
# endif
|
# endif
|
||||||
return;
|
return;
|
||||||
|
@ -763,9 +763,9 @@ static void send_consumer(uint16_t data) {
|
||||||
#ifdef EXTRAKEY_ENABLE
|
#ifdef EXTRAKEY_ENABLE
|
||||||
# ifdef BLUETOOTH_ENABLE
|
# ifdef BLUETOOTH_ENABLE
|
||||||
if (where_to_send() == OUTPUT_BLUETOOTH) {
|
if (where_to_send() == OUTPUT_BLUETOOTH) {
|
||||||
# ifdef MODULE_ADAFRUIT_BLE
|
# ifdef BLUETOOTH_BLUEFRUIT_LE
|
||||||
adafruit_ble_send_consumer_key(data);
|
bluefruit_le_send_consumer_key(data);
|
||||||
# elif MODULE_RN42
|
# elif BLUETOOTH_RN42
|
||||||
rn42_send_consumer(data);
|
rn42_send_consumer(data);
|
||||||
# endif
|
# endif
|
||||||
return;
|
return;
|
||||||
|
@ -1013,7 +1013,7 @@ void protocol_pre_init(void) {
|
||||||
setup_usb();
|
setup_usb();
|
||||||
sei();
|
sei();
|
||||||
|
|
||||||
#if defined(MODULE_RN42)
|
#if defined(BLUETOOTH_RN42)
|
||||||
rn42_init();
|
rn42_init();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -1066,8 +1066,8 @@ void protocol_post_task(void) {
|
||||||
MIDI_Device_USBTask(&USB_MIDI_Interface);
|
MIDI_Device_USBTask(&USB_MIDI_Interface);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef MODULE_ADAFRUIT_BLE
|
#ifdef BLUETOOTH_BLUEFRUIT_LE
|
||||||
adafruit_ble_task();
|
bluefruit_le_task();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef VIRTSER_ENABLE
|
#ifdef VIRTSER_ENABLE
|
||||||
|
|
|
@ -22,7 +22,7 @@ ifeq ($(strip $(BT)), yes)
|
||||||
OPT_DEFS += -DBLUEFRUIT
|
OPT_DEFS += -DBLUEFRUIT
|
||||||
#Adafruit Bluefruit controller settings
|
#Adafruit Bluefruit controller settings
|
||||||
BLUETOOTH_ENABLE = yes
|
BLUETOOTH_ENABLE = yes
|
||||||
BLUETOOTH_DRIVER = AdafruitBLE
|
BLUETOOTH_DRIVER = BluefruitLE
|
||||||
F_CPU = 8000000
|
F_CPU = 8000000
|
||||||
CONSOLE_ENABLE = no # Console for debug(+400)
|
CONSOLE_ENABLE = no # Console for debug(+400)
|
||||||
COMMAND_ENABLE = no # Commands for debug and configuration
|
COMMAND_ENABLE = no # Commands for debug and configuration
|
||||||
|
|
Loading…
Reference in a new issue