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

Cleanup and some changes to make implementation a bit more conforming to the standard.

Browse source
This commit is contained in:
doragasu 2016-03-13 18:29:30 +01:00
parent f14025b1c7
commit 9651692ca2
3 changed files with 93 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

80
extras/sntp/sntp.h
View file

@ -9,48 +9,74 @@
#define _SNTP_H_
#include <stdint.h>
#include <sys/time.h>
#include <time.h>
/// Update SNTP RTC timer
void sntp_update_rtc(time_t t, uint32_t us);
/// Function used to update the date/time, with microseconds resolution.
/*
* Function used by lwIP sntp module to update the date/time,
* with microseconds resolution.
*/
#define SNTP_SET_SYSTEM_TIME_US(sec, us) sntp_update_rtc(sec, us)
/// For the lwIP implementation of SNTP to allow using names for NTP servers.
/*
* For the lwIP implementation of SNTP to allow using names for NTP servers.
*/
#define SNTP_SERVER_DNS 1
/// Number of supported NTP servers
/*
* Number of supported NTP servers
*/
#define SNTP_NUM_SERVERS_SUPPORTED 4
/// Initialize the module, and start requesting SNTP updates. This function
/// must be called only once.
void sntp_initialize(int time_zone, int day_light);
/*
* Initialize the module, and start requesting SNTP updates. This function
* must be called only once.
* WARNING: tz->tz_dsttime doesn't have the same meaning as the standard
* implementation. If it is set to 1, a dst hour will be applied. If set
* to zero, time will not be modified.
*/
void sntp_initialize(const struct timezone *tz);
/// Sets time zone. Allowed values are in the range [-11, 13].
/// NOTE: Settings do not take effect until SNTP time is updated. It is
void sntp_set_timezone(int time_zone);
/*
* Sets time zone. Allowed values are in the range [-11, 13].
* NOTE: Settings do not take effect until SNTP time is updated. It is
* recommended to set these parameters only during initialization.
* WARNING: tz->tz_dsttime doesn't have the same meaning as the standard
* implementation. If it is set to 1, a dst hour will be applied. If set
* to zero, time will not be modified.
*/
void sntp_set_timezone(const struct timezone *tz);
/// Sets daylight.
/// NOTE: Settings do not take effect until SNTP time is updated.
void sntp_set_daylight(int day_light);
/// Returns the time read from RTC counter, in seconds from Epoch. If
/// us is not null, it will be filled with the microseconds.
time_t sntp_get_rtc_time(int32_t *us);
/// Returns the time in seconds since Epoch. If tloc is not NULL, return
/// value is also stored in the memory pointed by tloc.
/*
* Returns the time in seconds since Epoch. If tloc is not NULL, return
* value is also stored in the memory pointed by tloc.
*/
time_t time(time_t *tloc);
/// Set SNTP servers. Up to SNTP_NUM_SERVERS_SUPPORTED can be set.
/// Returns 0 if OK, less than 0 if error.
/// NOTE: This function must NOT be called before sntp_initialize().
/*
* Set SNTP servers. Up to SNTP_NUM_SERVERS_SUPPORTED can be set.
* Returns 0 if OK, less than 0 if error.
* NOTE: This function must NOT be called before sntp_initialize().
*/
int sntp_set_servers(char *server_url[], int num_servers);
/// Sets the update delay in ms. If requested value is less than 15s,
/// a 15s update interval will be set.
/*
* Sets the update delay in ms. If requested value is less than 15s,
* a 15s update interval will be set.
*/
void sntp_set_update_delay(uint32_t ms);
/*
* Returns the time read from RTC counter, in seconds from Epoch. If
* us is not null, it will be filled with the microseconds.
*/
time_t sntp_get_rtc_time(int32_t *us);
/*
* Update RTC timer. This function is called by the SNTP module each time
* an SNTP update is received.
*/
void sntp_update_rtc(time_t t, uint32_t us);
#endif /* _SNTP_H_ */

71
extras/sntp/sntp_fun.c
View file

@ -7,7 +7,6 @@
#include <sys/reent.h>
#include <sys/types.h>
#include <sys/errno.h>
#include <sys/time.h>
#include <stdio.h>
#include <espressif/esp_common.h>
#include <esp/timer.h>
@ -15,7 +14,6 @@
#include "sntp.h"
#define TIMER_COUNT RTC.COUNTER
#define __UNUSED(var) (void)var
// daylight settings
// Base calculated with value obtained from NTP server (64 bits)
@ -24,47 +22,35 @@
#define tim_ref (RTC.SCRATCH[2])
// Calibration value
#define cal (RTC.SCRATCH[3])
// Timezone (-11 to +13)
static int8_t tz;
// Daylight savings
static bool dst;
//// Setters and getters for CAL, TZ and DST.
//#define RTC_CAL_SET(val) (RTC.SCRATCH[3] |= (val) & 0x0000FFFF)
//#define RTC_DST_SET(val) (RTC.SCRATCH[3] |= ((val)<<16) & 0x00010000)
//#define RTC_TZ_SET(val) (RTC.SCRATCH[3] |= ((val)<<24) & 0xFF000000)
//
//#define RTC_CAL_GET() (RTC.SCRATCH[3] & 0x0000FFFF)
//#define RTC_DST_GET() ((RTC.SCRATCH[3] & 0x00010000)>>16)
//#define RTC_TZ_GET() ((((int)RTC.SCRATCH[3]) & ((int)0xFF000000))>>24)
// Timezone related data.
static struct timezone stz;
// Implemented in sntp.c
void sntp_init(void);
// Sets time zone. Allowed values are in the range [-11, 13].
// Sets time zone.
// NOTE: Settings do not take effect until SNTP time is updated.
void sntp_set_timezone(int time_zone) {
tz = time_zone;
//RTC_TZ_SET(time_zone);
void sntp_set_timezone(const struct timezone *tz) {
if (tz) {
stz = *tz;
} else {
stz.tz_minuteswest = 0;
stz.tz_dsttime = 0;
}
}
// Sets daylight.
// NOTE: Settings do not take effect until SNTP time is updated.
void sntp_set_daylight(int day_light) {
dst = day_light;
//RTC_DST_SET(day_light);
}
void sntp_initialize(int time_zone, int day_light) {
// Initialization
void sntp_initialize(const struct timezone *tz) {
if (tz) {
stz = *tz;
} else {
stz.tz_minuteswest = 0;
stz.tz_dsttime = 0;
}
sntp_base = 0;
tz = time_zone;
//RTC_TZ_SET(time_zone);
dst = day_light;
//RTC_DST_SET(day_light);
// To avoid div by 0 exceptions if requesting time before SNTP config
cal = 1;
//RTC_CAL_SET(1);
tim_ref = TIMER_COUNT;
sntp_init();
}
@ -91,25 +77,25 @@ inline time_t sntp_get_rtc_time(int32_t *us) {
// Check for timer wrap
sntp_check_timer_wrap(tim);
base = sntp_base + tim - tim_ref;
// secs = base * RTC_CAL_GET() / (1000000U<<12);
secs = base * cal / (1000000U<<12);
if (us) {
// *us = base * RTC_CAL_GET() % (1000000U<<12);
*us = base * cal % (1000000U<<12);
}
return secs;
}
// Syscall implementation
// Syscall implementation. doesn't seem to use tzp.
int _gettimeofday_r(struct _reent *r, struct timeval *tp, void *tzp) {
__UNUSED(r);
__UNUSED(tzp);
(void)r;
// Syscall defined by xtensa newlib defines tzp as void*
// So it looks like it is not used. Also check tp is not NULL
if (tzp || !tp) return EINVAL;
printf("DEB; gettimeofday called");
tp->tv_sec = sntp_get_rtc_time((int32_t*)&tp->tv_usec);
return 0;
}
// Added te get nearer the standard way of using time functions.
time_t time(time_t *tloc) {
time_t datetime;
@ -118,23 +104,18 @@ time_t time(time_t *tloc) {
return datetime;
}
/// 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) {
// Apply daylight and timezone correction
// t += (RTC_TZ_GET() + RTC_DST_GET()) * 3600;
t += (tz + dst) * 3600;
t += (stz.tz_minuteswest + stz.tz_dsttime * 60) * 60;
// DEBUG: Compute and print drift
int64_t sntp_current = sntp_base + TIMER_COUNT - tim_ref;
// int64_t sntp_correct = (((uint64_t)us + (uint64_t)t * 1000000U)<<12) / RTC_CAL_GET();
int64_t sntp_correct = (((uint64_t)us + (uint64_t)t * 1000000U)<<12) / cal;
// printf("\nRTC Adjust: drift = %ld ticks, cal = %d\n", (time_t)(sntp_correct - sntp_current), RTC_CAL_GET());
printf("\nRTC Adjust: drift = %ld ticks, cal = %d\n", (time_t)(sntp_correct - sntp_current), cal);
tim_ref = TIMER_COUNT;
cal = sdk_system_rtc_clock_cali_proc();
// RTC_CAL_SET(sdk_system_rtc_clock_cali_proc());
// sntp_base = (((uint64_t)us + (uint64_t)t * 1000000U)<<12) / RTC_CAL_GET();
sntp_base = (((uint64_t)us + (uint64_t)t * 1000000U)<<12) / cal;
}