Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/esp_log_timestamp_v4.1' into 'release/v4.1'

Browse source 
Use proper API to get Tick Count is esp_log_timestamp (v4.1)

See merge request espressif/esp-idf!7717
This commit is contained in:
Mahavir Jain 2020-02-20 21:11:10 +08:00
commit 0809136836
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) { 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);
} }
/* FIXME: define an API for getting the timestamp in soc/hal */ /* FIXME: define an API for getting the timestamp in soc/hal */