Skip to content

Ensure connectBLE doesn't return before HCI conn #3229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 27, 2025
Merged

Ensure connectBLE doesn't return before HCI conn #3229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions libraries/BluetoothHCI/src/BluetoothHCI.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ class BluetoothHCI {

void scanFree(); // Free allocated scan buffers

bool connected() {
return _hciConn != HCI_CON_HANDLE_INVALID;
}

friend class BluetoothHIDMaster;

protected:
Expand Down
17 changes: 16 additions & 1 deletion libraries/BluetoothHIDMaster/src/BluetoothHIDMaster.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,22 @@ bool BluetoothHIDMaster::connectBLE(const uint8_t *addr, int addrType) {
}
uint8_t a[6];
memcpy(a, addr, sizeof(a));
return ERROR_CODE_SUCCESS == gap_connect(a, (bd_addr_type_t)addrType);
if (ERROR_CODE_SUCCESS != gap_connect(a, (bd_addr_type_t)addrType)) {
return false;
}
// GAP connection running async. Wait for HCI connect
uint32_t now = millis();
while (millis() - now < 5000) {
if (_hci.connected()) {
break;
}
delay(25);
}
if (!_hci.connected()) {
gap_connect_cancel();
return false;
}
return _hci.connected();
}

bool BluetoothHIDMaster::connectBLE() {
Expand Down