espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-10-02 01:50:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'change/allow_esp_timer_init_from_user_code' into 'master'

Browse Source 
change(esp_timer): esp_timer_init_os now returns ESP_OK if esp_timer already initialized

Closes IDFGH-8182

See merge request espressif/esp-idf!42069
This commit is contained in:
Marius Vikhammer
2025-09-25 10:23:11 +08:00
parent 392226b37f 16cdbd9f5c
commit 88c9af78a7
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/esp_timer/src/esp_timer.c
View File

@@ -564,7 +564,13 @@ esp_err_t esp_timer_init(void)
*/
ESP_SYSTEM_INIT_FN(esp_timer_init_os, SECONDARY, ESP_TIMER_INIT_MASK, 100)
{
return esp_timer_init();
esp_err_t err = ESP_OK;
if (is_initialized()) {
err = ESP_OK;
} else {
err = esp_timer_init();
}
return err;
}
esp_err_t esp_timer_deinit(void)