arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-27 21:16:50 +03:00
Code

Added micros64 and used to fix and improve gettimeofday.

Browse Source
This commit is contained in:
Brandon White 2017-11-10 08:53:49 -06:00 committed by Ivan Grokhotkov
parent 303a71deea
commit 5b925697ec
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cores/esp8266/Arduino.h
View File

@ -202,6 +202,7 @@ void analogWriteRange(uint32_t range);
unsigned long millis(void); unsigned long millis(void);
unsigned long micros(void); unsigned long micros(void);
uint64_t micros64(void);
void delay(unsigned long); void delay(unsigned long);
void delayMicroseconds(unsigned int us); void delayMicroseconds(unsigned int us);
unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout); unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout);

7
cores/esp8266/core_esp8266_wiring.c
View File

@ -71,6 +71,13 @@ unsigned long ICACHE_RAM_ATTR micros() {
return system_get_time(); return system_get_time();
} }
uint64_t ICACHE_RAM_ATTR micros64() {
uint32_t low32_us = system_get_time();
uint32_t high32_us = micros_overflow_count + ((low32_us < micros_at_last_overflow_tick) ? 1 : 0);
uint64_t duration64_us = (uint64_t)high32_us << 32 | low32_us;
return duration64_us;
}
void ICACHE_RAM_ATTR delayMicroseconds(unsigned int us) { void ICACHE_RAM_ATTR delayMicroseconds(unsigned int us) {
os_delay_us(us); os_delay_us(us);
} }

19
cores/esp8266/time.c
View File

@ -31,23 +31,27 @@ struct timeval {
extern char* sntp_asctime(const struct tm *t); extern char* sntp_asctime(const struct tm *t);
extern struct tm* sntp_localtime(const time_t *clock); extern struct tm* sntp_localtime(const time_t *clock);
extern uint64_t micros64();
// time gap in seconds from 01.01.1900 (NTP time) to 01.01.1970 (UNIX time) // time gap in seconds from 01.01.1900 (NTP time) to 01.01.1970 (UNIX time)
#define DIFF1900TO1970 2208988800UL #define DIFF1900TO1970 2208988800UL
static int s_daylightOffset_sec = 0; static int s_daylightOffset_sec = 0;
static long s_timezone_sec = 0; static long s_timezone_sec = 0;
static time_t s_bootTime = 0; static bool s_bootTimeSet = false;
static uint64_t s_bootTime_us = 0;
// calculate offset used in gettimeofday // calculate offset used in gettimeofday
static void ensureBootTimeIsSet() static void ensureBootTimeIsSet()
{ {
if (!s_bootTime) // Check just a bool flag instead of the full 64-bit s_bootTime for zero.
if (!s_bootTimeSet)
{ {
time_t now = sntp_get_current_timestamp(); time_t now_s = sntp_get_current_timestamp();
if (now) if (now_s)
{ {
s_bootTime = now - millis() / 1000; s_bootTime_us = now_s * 1000000ULL - micros64();
s_bootTimeSet = true;
} }
} }
} }
@ -100,8 +104,9 @@ int _gettimeofday_r(struct _reent* unused, struct timeval *tp, void *tzp)
if (tp) if (tp)
{ {
ensureBootTimeIsSet(); ensureBootTimeIsSet();
tp->tv_sec = s_bootTime + millis() / 1000; uint64_t currentTime_us = s_bootTime_us + micros64();
tp->tv_usec = micros(); tp->tv_sec = currentTime_us / 1000000ULL;
tp->tv_usec = currentTime_us % 1000000ULL;
} }
return 0; return 0;
} }