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/clock_getres_accuracy_resolution' into 'master'

Browse Source 
newlib: Fix clock_getres() improves accuracy

See merge request espressif/esp-idf!10743
This commit is contained in:
Angus Gratton 2020-10-22 16:50:29 +08:00
commit 4df4bd9558
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_common/include/esp_private/system_internal.h
View File

@ -72,7 +72,7 @@ int64_t esp_system_get_time(void);
/**
* @brief Get the resolution of the time returned by `esp_system_get_time`.
*
* @returns the resolution in microseconds
* @returns the resolution in nanoseconds
*/
uint32_t esp_system_get_time_resolution(void);

2
components/esp_system/system_time.c
View File

@ -42,5 +42,5 @@ int64_t IRAM_ATTR __attribute__((weak)) esp_system_get_time(void)
uint32_t IRAM_ATTR __attribute__((weak)) esp_system_get_time_resolution(void)
{
return 1000000L / rtc_clk_slow_freq_get_hz();
return 1000000000L / rtc_clk_slow_freq_get_hz();
}

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

@ -534,6 +534,6 @@ int64_t IRAM_ATTR esp_system_get_time(void)
uint32_t IRAM_ATTR esp_system_get_time_resolution(void)
{
return 1;
return 1000;
}
#endif

2
components/newlib/time.c
View File

@ -287,7 +287,7 @@ int clock_getres (clockid_t clock_id, struct timespec *res)
}
res->tv_sec = 0;
res->tv_nsec = esp_system_get_time_resolution() * 1000;
res->tv_nsec = esp_system_get_time_resolution();
return 0;
#else