github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-03 03:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'esp32_ble_tracker_opt' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2026-01-17 16:23:37 -10:00
parent 03eaec853a 759278191b
commit 59eeeb5fe5
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+20 -14
View File
@@ -107,21 +107,27 @@ void ESP32BLETracker::loop() {
// Check for scan timeout - moved here from scheduler to avoid false reboots
// when the loop is blocked. This must run every iteration for safety.
if (this->scanner_state_ == ScannerState::RUNNING) {
if (this->scan_timeout_state_ == ScanTimeoutState::MONITORING) {
// Robust time comparison that handles rollover correctly
// This works because unsigned arithmetic wraps around predictably
if ((App.get_loop_component_start_time() - this->scan_start_time_) > this->scan_timeout_ms_) {
// First time we've seen the timeout exceeded - wait one more loop iteration
// This ensures all components have had a chance to process pending events
// This is because esp32_ble may not have run yet and called
// gap_scan_event_handler yet when the loop unblocks
ESP_LOGW(TAG, "Scan timeout exceeded");
this->scan_timeout_state_ = ScanTimeoutState::EXCEEDED_WAIT;
switch (this->scan_timeout_state_) {
case ScanTimeoutState::MONITORING: {
// Robust time comparison that handles rollover correctly
// This works because unsigned arithmetic wraps around predictably
if ((App.get_loop_component_start_time() - this->scan_start_time_) > this->scan_timeout_ms_) {
// First time we've seen the timeout exceeded - wait one more loop iteration
// This ensures all components have had a chance to process pending events
// This is because esp32_ble may not have run yet and called
// gap_scan_event_handler yet when the loop unblocks
ESP_LOGW(TAG, "Scan timeout exceeded");
this->scan_timeout_state_ = ScanTimeoutState::EXCEEDED_WAIT;
}
break;
}
} else if (this->scan_timeout_state_ == ScanTimeoutState::EXCEEDED_WAIT) {
// We've waited at least one full loop iteration, and scan is still running
ESP_LOGE(TAG, "Scan never terminated, rebooting");
App.reboot();
case ScanTimeoutState::EXCEEDED_WAIT:
// We've waited at least one full loop iteration, and scan is still running
ESP_LOGE(TAG, "Scan never terminated, rebooting");
App.reboot();
break;
case ScanTimeoutState::INACTIVE:
break;
}
}