Browse Source

Merge branch 'WIP2-Bluetooth' of https://github.com/mjs513/USBHost_t36 into WIP2-Bluetooth

main
Mike S 5 years ago
parent
commit
67e88e1749
2 changed files with 3 additions and 3 deletions
  1. +1
    -1
      USBHost_t36.h
  2. +2
    -2
      bluetooth.cpp

+ 1
- 1
USBHost_t36.h View File





//#define USBHOST_PRINT_DEBUG //#define USBHOST_PRINT_DEBUG
#define USBHDBGSerial Serial1
//#define USBHDBGSerial Serial1




#ifndef USBHDBGSerial #ifndef USBHDBGSerial

+ 2
- 2
bluetooth.cpp View File

#define print USBHost::print_ #define print USBHost::print_
#define println USBHost::println_//#define DEBUG_BT #define println USBHost::println_//#define DEBUG_BT


#define DEBUG_BT
//#define DEBUG_BT
#define DEBUG_BT_VERBOSE #define DEBUG_BT_VERBOSE


#ifndef DEBUG_BT #ifndef DEBUG_BT
// 03 0b 04 00 00 40 25 00 58 4b 00 01 00 // 03 0b 04 00 00 40 25 00 58 4b 00 01 00
device_connection_handle_ = rxbuf_[3]+ (uint16_t)(rxbuf_[4]<<8); device_connection_handle_ = rxbuf_[3]+ (uint16_t)(rxbuf_[4]<<8);
DBGPrintf(" Connection Complete - ST:%x LH:%x\n", rxbuf_[2], device_connection_handle_); DBGPrintf(" Connection Complete - ST:%x LH:%x\n", rxbuf_[2], device_connection_handle_);
if (do_pair_device_) {
if (do_pair_device_ && !(device_driver_ && (device_driver_->special_process_required & BTHIDInput::SP_DONT_NEED_CONNECT))) {
sendHCIAuthenticationRequested(); sendHCIAuthenticationRequested();
pending_control_ = PC_AUTHENTICATION_REQUESTED; pending_control_ = PC_AUTHENTICATION_REQUESTED;
} else if (device_driver_ && (device_driver_->special_process_required & BTHIDInput::SP_NEED_CONNECT)) { } else if (device_driver_ && (device_driver_->special_process_required & BTHIDInput::SP_NEED_CONNECT)) {

Loading…
Cancel
Save