Skip to content

Commit

Permalink
More Bluetooth refactoring (#9905)
Browse files Browse the repository at this point in the history
  • Loading branch information
fauxpark authored and noroadsleft committed Aug 29, 2020
1 parent 47f8947 commit 3f392c0
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 19 deletions.
1 change: 1 addition & 0 deletions tmk_core/common/progmem.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# include <avr/pgmspace.h>
#else
# define PROGMEM
# define PGM_P const char *
# define memcpy_P(dest, src, n) memcpy(dest, src, n)
# define pgm_read_byte(address_short) *((uint8_t*)(address_short))
# define pgm_read_word(address_short) *((uint16_t*)(address_short))
Expand Down
23 changes: 11 additions & 12 deletions tmk_core/protocol/lufa/adafruit_ble.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,19 @@
* Author: Wez Furlong, 2016
* Supports the Adafruit BLE board built around the nRF51822 chip.
*/

#pragma once
#ifdef MODULE_ADAFRUIT_BLE
# include <stdbool.h>
# include <stdint.h>
# include <string.h>

# include "config_common.h"
# include "progmem.h"
#include <stdbool.h>
#include <stdint.h>
#include <string.h>

#include "config_common.h"
#include "progmem.h"

# ifdef __cplusplus
#ifdef __cplusplus
extern "C" {
# endif
#endif

/* Instruct the module to enable HID keyboard support and reset */
extern bool adafruit_ble_enable_keyboard(void);
Expand Down Expand Up @@ -54,8 +55,6 @@ extern uint32_t adafruit_ble_read_battery_voltage(void);
extern bool adafruit_ble_set_mode_leds(bool on);
extern bool adafruit_ble_set_power_level(int8_t level);

# ifdef __cplusplus
#ifdef __cplusplus
}
# endif

#endif // MODULE_ADAFRUIT_BLE
#endif
14 changes: 12 additions & 2 deletions tmk_core/protocol/lufa/outputselect.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,12 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include "lufa.h"
#include "outputselect.h"

#if defined(PROTOCOL_LUFA)
# include "lufa.h"
#endif

#ifdef MODULE_ADAFRUIT_BLE
# include "adafruit_ble.h"
#endif
Expand All @@ -35,12 +39,18 @@ void set_output(uint8_t output) {
*/
__attribute__((weak)) void set_output_user(uint8_t output) {}

static bool is_usb_configured(void) {
#if defined(PROTOCOL_LUFA)
return USB_DeviceState == DEVICE_STATE_Configured;
#endif
}

/** \brief Auto Detect Output
*
* FIXME: Needs doc
*/
uint8_t auto_detect_output(void) {
if (USB_DeviceState == DEVICE_STATE_Configured) {
if (is_usb_configured()) {
return OUTPUT_USB;
}

Expand Down
6 changes: 5 additions & 1 deletion tmk_core/protocol/lufa/outputselect.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#pragma once

#include <stdint.h>

enum outputs {
OUTPUT_AUTO,

Expand All @@ -37,4 +41,4 @@ enum outputs {
void set_output(uint8_t output);
void set_output_user(uint8_t output);
uint8_t auto_detect_output(void);
uint8_t where_to_send(void);
uint8_t where_to_send(void);
5 changes: 1 addition & 4 deletions tmk_core/protocol/serial.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,10 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/

#ifndef SERIAL_H
#define SERIAL_H
#pragma once

/* host role */
void serial_init(void);
uint8_t serial_recv(void);
int16_t serial_recv2(void);
void serial_send(uint8_t data);

#endif

0 comments on commit 3f392c0

Please sign in to comment.