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

Merge branch 'bugfix/time_jump_after_reboot_v5.0' into 'release/v5.0'

Browse Source 
esp_hw_support: Fix time jump after reboot (v5.0)

See merge request espressif/esp-idf!20906
This commit is contained in:
Ivan Grokhotkov
2022-12-02 19:21:08 +08:00
parent 5dc102bfac 61d05c0325
commit 7a5643342a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/esp_hw_support/esp_clk.c
View File

@ -50,7 +50,7 @@ extern uint32_t g_ticks_per_us_app;
static portMUX_TYPE s_esp_rtc_time_lock = portMUX_INITIALIZER_UNLOCKED;
// TODO: IDF-4239
static RTC_DATA_ATTR uint64_t s_esp_rtc_time_us = 0, s_rtc_last_ticks = 0;
static RTC_NOINIT_ATTR uint64_t s_esp_rtc_time_us, s_rtc_last_ticks;
inline static int IRAM_ATTR s_get_cpu_freq_mhz(void)
{
@ -97,6 +97,10 @@ uint64_t esp_rtc_get_time_us(void)
#endif
portENTER_CRITICAL_SAFE(&s_esp_rtc_time_lock);
const uint32_t cal = esp_clk_slowclk_cal_get();
if (cal == 0) {
s_esp_rtc_time_us = 0;
s_rtc_last_ticks = 0;
}
const uint64_t rtc_this_ticks = rtc_time_get();
const uint64_t ticks = rtc_this_ticks - s_rtc_last_ticks;
/* RTC counter result is up to 2^48, calibration factor is up to 2^24,