alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-09-25 09:42:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fixes_from_github' into 'master'

Browse Source 
Fixes from Github

See merge request idf/esp-idf!2730
This commit is contained in:
Ivan Grokhotkov
2018-07-13 15:03:50 +08:00
parent 46639bab85 3e1633354a
commit b354770f42
10 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp32/esp_timer_esp32.c
View File

@@ -201,7 +201,7 @@ uint64_t IRAM_ATTR esp_timer_impl_get_time()
ticks_per_us = s_timer_ticks_per_us;
/* Read them again and compare */
/* In this function, do not call timer_count_reload() when overflow is ture.
/* In this function, do not call timer_count_reload() when overflow is true.
* Because there's remain count enough to allow FRC_TIMER_COUNT_REG grow
*/
if (REG_READ(FRC_TIMER_COUNT_REG(1)) > timer_val &&