espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2026-08-03 20:35:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/i2c_wdt_after_nack' into 'master'

Browse Source 
fix(i2c): Fix the potential wdt might happen after nack

Closes IDFGH-16612

See merge request espressif/esp-idf!42554
This commit is contained in:
C.S.M
2025-10-14 13:58:26 +08:00
parent 1904fd4d9c 2523fee9cd
commit 12c633fd75
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_driver_i2c/i2c_master.c
+8 -1
View File
@@ -590,8 +590,15 @@ static void s_i2c_send_commands(i2c_master_bus_handle_t i2c_master, TickType_t t
// For i2c nack detected, the i2c transaction not finish.
// start->address->nack->stop
// So wait the whole transaction finishes, then quit the function.
TickType_t start_tick = xTaskGetTickCount();
const TickType_t timeout_ticks = ticks_to_wait;
while (i2c_ll_is_bus_busy(hal->dev)) {
__asm__ __volatile__("nop");
if ((xTaskGetTickCount() - start_tick) > timeout_ticks) {
ESP_LOGE(TAG, "I2C bus is still busy but software timeout detected");
atomic_store(&i2c_master->status, I2C_STATUS_TIMEOUT);
s_i2c_hw_fsm_reset(i2c_master, true);
break;
}
}
}
s_i2c_err_log_print(event, i2c_master->bypass_nack_log);