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

extras/sntp: Correct miscalculation of tv_usec

Browse source 
Missing >>12 inserted
This commit is contained in:
Jeff Kletsky 2018-02-06 21:42:11 -08:00
parent f328da17c1
commit 5ef8a8348a
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
extras/sntp/sntp_fun.c
View file

@ -88,9 +88,9 @@ inline time_t sntp_get_rtc_time(int32_t *us) {
// Check for timer wrap // Check for timer wrap
sntp_check_timer_wrap(tim); sntp_check_timer_wrap(tim);
base = sntp_base + tim - tim_ref; base = sntp_base + tim - tim_ref;
secs = base * cal / (1000000U<<12); secs = (base * cal) / (1000000U<<12);
if (us) { if (us) {
*us = base * cal % (1000000U<<12); *us = ((base * cal) % (1000000U<<12)) >>12;
} }
return secs; return secs;
} }
@ -154,7 +154,7 @@ void sntp_update_rtc(time_t t, uint32_t us) {
cal = sdk_system_rtc_clock_cali_proc(); cal = sdk_system_rtc_clock_cali_proc();
tim_ref = now_rtc; tim_ref = now_rtc;
sntp_base = (((uint64_t)us + (uint64_t)t * 1000000U)<<12) / cal; sntp_base = (((uint64_t)us + (uint64_t)t * 1000000U) <<12) / cal;
} }