diff options
| author | Mark <56205165+gamblor21@users.noreply.github.com> | 2021-03-15 20:00:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-15 20:00:13 -0500 |
| commit | e326d7ca800ce7101ddce001320c5349ee5ddeb6 (patch) | |
| tree | 000a06790af7a8d27e9ba9fc27e10015815e1509 /lib/timeutils | |
| parent | 307d2a99febbf6cdff824131dddc2ef938f5ea13 (diff) | |
| parent | f7a988b9b307141611b07f6dc9da5b26e982c154 (diff) | |
Merge branch 'main' into rp_dp_parallel
Diffstat (limited to 'lib/timeutils')
| -rw-r--r-- | lib/timeutils/timeutils.c | 10 | ||||
| -rw-r--r-- | lib/timeutils/timeutils.h | 18 |
2 files changed, 14 insertions, 14 deletions
diff --git a/lib/timeutils/timeutils.c b/lib/timeutils/timeutils.c index fdd3426ad..6cbea31aa 100644 --- a/lib/timeutils/timeutils.c +++ b/lib/timeutils/timeutils.c @@ -36,11 +36,11 @@ #define LEAPOCH ((31 + 29) * 86400) -#define DAYS_PER_400Y (365*400 + 97) -#define DAYS_PER_100Y (365*100 + 24) -#define DAYS_PER_4Y (365*4 + 1) +#define DAYS_PER_400Y (365 * 400 + 97) +#define DAYS_PER_100Y (365 * 100 + 24) +#define DAYS_PER_4Y (365 * 4 + 1) -STATIC const uint16_t days_since_jan1[]= { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 }; +STATIC const uint16_t days_since_jan1[] = { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 }; bool timeutils_is_leap_year(mp_uint_t year) { return (year % 4 == 0 && year % 100 != 0) || year % 400 == 0; @@ -164,7 +164,7 @@ void timeutils_seconds_since_epoch_to_struct_time(mp_uint_t t, timeutils_struct_ } mp_uint_t timeutils_seconds_since_epoch(mp_uint_t year, mp_uint_t month, mp_uint_t date, - mp_uint_t hour, mp_uint_t minute, mp_uint_t second) { + mp_uint_t hour, mp_uint_t minute, mp_uint_t second) { mp_uint_t t = timeutils_seconds_since_2000(year, month, date, hour, minute, second); return t + EPOCH1970_EPOCH2000_DIFF_SECS; } diff --git a/lib/timeutils/timeutils.h b/lib/timeutils/timeutils.h index 4ba8c7fda..168617428 100644 --- a/lib/timeutils/timeutils.h +++ b/lib/timeutils/timeutils.h @@ -30,14 +30,14 @@ #define EPOCH1970_EPOCH2000_DIFF_SECS 946684800 typedef struct _timeutils_struct_time_t { - uint16_t tm_year; // i.e. 2014 - uint8_t tm_mon; // 1..12 - uint8_t tm_mday; // 1..31 - uint8_t tm_hour; // 0..23 - uint8_t tm_min; // 0..59 - uint8_t tm_sec; // 0..59 - uint8_t tm_wday; // 0..6 0 = Monday - uint16_t tm_yday; // 1..366 + uint16_t tm_year; // i.e. 2014 + uint8_t tm_mon; // 1..12 + uint8_t tm_mday; // 1..31 + uint8_t tm_hour; // 0..23 + uint8_t tm_min; // 0..59 + uint8_t tm_sec; // 0..59 + uint8_t tm_wday; // 0..6 0 = Monday + uint16_t tm_yday; // 1..366 } timeutils_struct_time_t; bool timeutils_is_leap_year(mp_uint_t year); @@ -53,7 +53,7 @@ mp_uint_t timeutils_seconds_since_2000(mp_uint_t year, mp_uint_t month, void timeutils_seconds_since_epoch_to_struct_time(mp_uint_t t, timeutils_struct_time_t *tm); mp_uint_t timeutils_seconds_since_epoch(mp_uint_t year, mp_uint_t month, mp_uint_t date, - mp_uint_t hour, mp_uint_t minute, mp_uint_t second); + mp_uint_t hour, mp_uint_t minute, mp_uint_t second); mp_uint_t timeutils_mktime(mp_uint_t year, mp_int_t month, mp_int_t mday, mp_int_t hours, mp_int_t minutes, mp_int_t seconds); |