alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/esp_log_timestamp' into 'master'

Browse Source 
Use proper API to get Tick Count is esp_log_timestamp

See merge request espressif/esp-idf!7501
This commit is contained in:
Mahavir Jain 2020-02-07 13:46:19 +08:00
commit 41e29e9037
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/log/log_freertos.c
View File

@ -99,7 +99,8 @@ uint32_t esp_log_timestamp(void)
if (base == 0 && xPortGetCoreID() == 0) {
base = esp_log_early_timestamp();
}
return base + xTaskGetTickCount() * (1000 / configTICK_RATE_HZ);
TickType_t tick_count = xPortInIsrContext() ? xTaskGetTickCountFromISR() : xTaskGetTickCount();
return base + tick_count * (1000 / configTICK_RATE_HZ);
}
/* FIXME: define an API for getting the timestamp in soc/hal */