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

log: Check for ISR context and use proper API to get Tick Count

Browse Source
This commit is contained in:
Shubham Kulkarni
2020-02-20 15:55:22 +05:30
parent b04e643bd0
commit 2966f8cb8c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/log/log.c
View File

@ -341,7 +341,9 @@ uint32_t IRAM_ATTR esp_log_timestamp()
if (base == 0 && xPortGetCoreID() == 0) { if (base == 0 && xPortGetCoreID() == 0) {
base = esp_log_early_timestamp(); 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);
} }
#else #else