Merge branch 'paring'

This commit is contained in:
Kristian Sloth Lauszus 2016-04-19 11:42:30 +02:00
commit 85a6c43d4e

View file

@ -589,6 +589,7 @@ void BTD::HCI_event_task() {
break; break;
case EV_AUTHENTICATION_COMPLETE: case EV_AUTHENTICATION_COMPLETE:
if(!hcibuf[2]) { // Check if paring was successful
if(pairWithWii && !connectToWii) { if(pairWithWii && !connectToWii) {
#ifdef DEBUG_USB_HOST #ifdef DEBUG_USB_HOST
Notify(PSTR("\r\nPairing successful with Wiimote"), 0x80); Notify(PSTR("\r\nPairing successful with Wiimote"), 0x80);
@ -600,6 +601,14 @@ void BTD::HCI_event_task() {
#endif #endif
connectToHIDDevice = true; // Used to indicate to the BTHID service, that it should connect to this device connectToHIDDevice = true; // Used to indicate to the BTHID service, that it should connect to this device
} }
} else {
#ifdef DEBUG_USB_HOST
Notify(PSTR("\r\nParing Failed: "), 0x80);
D_PrintHex<uint8_t > (hcibuf[2], 0x80);
#endif
hci_disconnect(hci_handle);
hci_state = HCI_DISCONNECT_STATE;
}
break; break;
/* We will just ignore the following events */ /* We will just ignore the following events */
case EV_NUM_COMPLETE_PKT: case EV_NUM_COMPLETE_PKT: