adolforeyna/tactility
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Fix BLE connection collision and filter unnamed devices"

Browse Source 
This reverts commit bf7e40f0f1.
This commit is contained in:
Adolfo Reyna
2026-06-26 13:40:20 -04:00
parent bf7e40f0f1
commit 68bf8f5a01
1 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Platforms/platform-esp32/source/drivers/bluetooth/esp32_ble_scan.cpp
+8 -21
View File
@@ -57,7 +57,6 @@ int ble_gap_disc_event_handler(struct ble_gap_event* event, void* arg) {
} }
} }
bool should_publish = false;
{ {
xSemaphoreTake(ctx->scan_mutex, portMAX_DELAY); xSemaphoreTake(ctx->scan_mutex, portMAX_DELAY);
bool found = false; bool found = false;
@@ -69,41 +68,29 @@ int ble_gap_disc_event_handler(struct ble_gap_event* event, void* arg) {
} }
ctx->scan_results[i].rssi = record.rssi; ctx->scan_results[i].rssi = record.rssi;
found = true; found = true;
should_publish = true;
break; break;
} }
} }
if (!found && record.name[0] != '\0' && ctx->scan_count < 64) { if (!found && ctx->scan_count < 64) {
ctx->scan_results[ctx->scan_count] = record; ctx->scan_results[ctx->scan_count] = record;
ctx->scan_addrs[ctx->scan_count] = disc.addr; // full addr (type+val) ctx->scan_addrs[ctx->scan_count] = disc.addr; // full addr (type+val)
ctx->scan_count++; ctx->scan_count++;
should_publish = true;
} }
xSemaphoreGive(ctx->scan_mutex); xSemaphoreGive(ctx->scan_mutex);
} }
if (should_publish) { struct BtEvent e = {};
LOG_I(TAG, "Peer found: name='%s' addr=%02x:%02x:%02x:%02x:%02x:%02x rssi=%d", e.type = BT_EVENT_PEER_FOUND;
record.name, e.peer = record;
record.addr[0], record.addr[1], record.addr[2], ble_publish_event(device, e);
record.addr[3], record.addr[4], record.addr[5],
record.rssi);
struct BtEvent e = {};
e.type = BT_EVENT_PEER_FOUND;
e.peer = record;
ble_publish_event(device, e);
}
break; break;
} }
case BLE_GAP_EVENT_DISC_COMPLETE: case BLE_GAP_EVENT_DISC_COMPLETE:
LOG_I(TAG, "Scan complete (reason=%d)", event->disc_complete.reason); LOG_I(TAG, "Scan complete (reason=%d)", event->disc_complete.reason);
ble_set_scan_active(device, false); // Keep scan_active=true; resolveNextUnnamedPeer clears it and fires ScanFinished
{ // once name resolution finishes, so the UI spinner stays active throughout.
struct BtEvent e = {}; ble_resolve_next_unnamed_peer(device, 0);
e.type = BT_EVENT_SCAN_FINISHED;
ble_publish_event(device, e);
}
break; break;
default: default: