Merge branch 'bugfix/esp_log_timestamp_v3.3' into 'release/v3.3'

Use proper API to get Tick Count is esp_log_timestamp (v3.3)

See merge request espressif/esp-idf!7720
This commit is contained in:
Mahavir Jain 2020-02-20 20:13:23 +08:00
commit 32387506fb

View file

@ -339,7 +339,8 @@ uint32_t IRAM_ATTR esp_log_timestamp()
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);
}
#else