j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

extras/sntp: Capture RTC counts immediately on update

Browse source 
Get the "best value" rather than waiting for logging
This commit is contained in:
Jeff Kletsky 2018-02-06 19:02:03 -08:00
parent 7821c098d8
commit dba2d93c21
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
extras/sntp/sntp_fun.c
View file

@ -102,18 +102,22 @@ int _gettimeofday_r(struct _reent *r, struct timeval *tp, void *tzp) {
// Update RTC timer. Called by SNTP module each time it receives an update. // Update RTC timer. Called by SNTP module each time it receives an update.
void sntp_update_rtc(time_t t, uint32_t us) { void sntp_update_rtc(time_t t, uint32_t us) {
uint32_t rtc_now = TIMER_COUNT;
// Apply daylight and timezone correction // Apply daylight and timezone correction
t += (stz.tz_minuteswest + stz.tz_dsttime * 60) * 60; t += (stz.tz_minuteswest + stz.tz_dsttime * 60) * 60;
// DEBUG: Compute and print drift // DEBUG: Compute and print drift
int64_t sntp_current = sntp_base + TIMER_COUNT - tim_ref; int64_t sntp_current = sntp_base + rtc_now - tim_ref;
int64_t sntp_correct = (((uint64_t)us + (uint64_t)t * 1000000U)<<12) / cal; int64_t sntp_correct = (((uint64_t)us + (uint64_t)t * 1000000U)<<12) / cal;
// esp-open-rtos printf does not supply %lld or PRiu64; use long double // esp-open-rtos printf does not supply %lld or PRiu64; use long double
SNTP_LOGD("RTC Adjust: drift = %.0Lf ticks, cal = %d", SNTP_LOGD("RTC Adjust: drift = %.0Lf ticks, cal = %d",
(long double)(sntp_correct - sntp_current), (uint32_t)cal); (long double)(sntp_correct - sntp_current), (uint32_t)cal);
tim_ref = TIMER_COUNT;
cal = sdk_system_rtc_clock_cali_proc();
cal = sdk_system_rtc_clock_cali_proc();
tim_ref = rtc_now;
sntp_base = (((uint64_t)us + (uint64_t)t * 1000000U)<<12) / cal; sntp_base = (((uint64_t)us + (uint64_t)t * 1000000U)<<12) / cal;
} }