From 6678595e7ed9e36c4aa1460f0af87119bd880240 Mon Sep 17 00:00:00 2001 From: Dave Hylands Date: Tue, 19 Aug 2014 18:38:38 -0700 Subject: [PATCH 1/2] Add time.mktime and enhance time.localtime (for stmhal) Now you can use time.localtime on the timestamps presented by os.stat --- stmhal/modtime.c | 253 ++++++++++++++++++++++++++++++++++++++---- stmhal/qstrdefsport.h | 1 + 2 files changed, 233 insertions(+), 21 deletions(-) diff --git a/stmhal/modtime.c b/stmhal/modtime.c index bdea1f4c3d..f6bde274ff 100644 --- a/stmhal/modtime.c +++ b/stmhal/modtime.c @@ -24,6 +24,8 @@ * THE SOFTWARE. */ +#include +#include #include "stm32f4xx_hal.h" #include "mpconfig.h" @@ -34,17 +36,41 @@ #include "portmodules.h" #include "rtc.h" +#define DAYS_PER_400Y (365*400 + 97) +#define DAYS_PER_100Y (365*100 + 24) +#define DAYS_PER_4Y (365*4 + 1) + +typedef struct { + 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 +} mod_struct_time; + /// \module time - time related functions /// /// The `time` module provides functions for getting the current time and date, /// and for sleeping. -STATIC const uint16_t days_since_jan1[]= { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 }; +STATIC const uint16_t days_since_jan1[]= { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 }; STATIC bool is_leap_year(mp_uint_t year) { return (year % 4 == 0 && year % 100 != 0) || year % 400 == 0; } +// Month is one based +STATIC mp_uint_t days_in_month(mp_uint_t year, mp_uint_t month) { + mp_uint_t mdays = days_since_jan1[month] - days_since_jan1[month - 1]; + if (month == 2 && is_leap_year(year)) { + mdays++; + } + return mdays; +} + // compute the day of the year, between 1 and 366 // month should be between 1 and 12, date should start at 1 mp_uint_t mod_time_year_day(mp_uint_t year, mp_uint_t month, mp_uint_t date) { @@ -55,7 +81,7 @@ mp_uint_t mod_time_year_day(mp_uint_t year, mp_uint_t month, mp_uint_t date) { return yday; } -// returns the number of seconds, as an integer, since 1/1/2000 +// returns the number of seconds, as an integer, since 2000-01-01 mp_uint_t mod_time_seconds_since_2000(mp_uint_t year, mp_uint_t month, mp_uint_t date, mp_uint_t hour, mp_uint_t minute, mp_uint_t second) { return second @@ -69,29 +95,213 @@ mp_uint_t mod_time_seconds_since_2000(mp_uint_t year, mp_uint_t month, mp_uint_t + (year - 2000) * 31536000; } -/// \function localtime() -/// Returns time stored in RTC as: (year, month, date, hour, minute, second, weekday). -/// Weekday is 0-6 for Mon-Sun. -STATIC mp_obj_t time_localtime(void) { - // get date and time - // note: need to call get time then get date to correctly access the registers - RTC_DateTypeDef date; - RTC_TimeTypeDef time; - HAL_RTC_GetTime(&RTCHandle, &time, FORMAT_BIN); - HAL_RTC_GetDate(&RTCHandle, &date, FORMAT_BIN); +// LEAPOCH corresponds to 2000-03-01, which is a mod-400 year, immediately +// after Feb 29. We calculate seconds as a signed integer relative to that. +// +// Our timebase is is relative to 2000-01-01. + +#define LEAPOCH ((31 + 29) * 86400) + +void mod_time_seconds_since_2000_to_struct_time(mp_uint_t t, mod_struct_time *tm) { + memset(tm, 0, sizeof(*tm)); + + // The following algorithm was adapted from musl's __secs_to_tm and adapted + // for differences in MicroPython's timebase. + + mp_int_t seconds = t - LEAPOCH; + + mp_int_t days = seconds / 86400; + seconds %= 86400; + tm->tm_hour = seconds / 3600; + tm->tm_min = seconds / 60 % 60; + tm->tm_sec = seconds % 60; + + mp_int_t wday = (days + 2) % 7; // Mar 1, 2000 was a Wednesday (2) + if (wday < 0) { + wday += 7; + } + tm->tm_wday = wday; + + mp_int_t qc_cycles = days / DAYS_PER_400Y; + days %= DAYS_PER_400Y; + if (days < 0) { + days += DAYS_PER_400Y; + qc_cycles--; + } + mp_int_t c_cycles = days / DAYS_PER_100Y; + if (c_cycles == 4) { + c_cycles--; + } + days -= (c_cycles * DAYS_PER_100Y); + + mp_int_t q_cycles = days / DAYS_PER_4Y; + if (q_cycles == 25) { + q_cycles--; + } + days -= q_cycles * DAYS_PER_4Y; + + mp_int_t years = days / 365; + if (years == 4) { + years--; + } + days -= (years * 365); + + mp_int_t leap = !years && (q_cycles || !c_cycles); + + tm->tm_yday = days + 31 + 28 + leap; + if (tm->tm_yday >= 365 + leap) { + tm->tm_yday -= 365 + leap; + } + + tm->tm_year = 2000 + years + 4 * q_cycles + 100 * c_cycles + 400 * qc_cycles; + + // Note: days_in_month[0] corresponds to March + static const int8_t days_in_month[] = {31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 31, 29}; + + mp_int_t month; + for (month = 0; days_in_month[month] <= days; month++) { + days -= days_in_month[month]; + } + + tm->tm_mon = month + 2; + if (tm->tm_mon >= 12) { + tm->tm_mon -= 12; + tm->tm_year++; + } + tm->tm_mday = days + 1; // Make one based + tm->tm_mon++; // Make one based + tm->tm_yday++; // Make one based +} + + +/// \function localtime([secs]) +/// Convert a time expressed in seconds since Jan 1, 2000 into an 8-tuple which +/// contains: (year, month, mday, hour, minute, second, weekday, yearday) +/// If secs is not provided or None, then the current time from the RTC is used. +/// year includes the century (for example 2014) +/// month is 1-12 +/// mday is 1-31 +/// hour is 0-23 +/// minute is 0-59 +/// second is 0-59 +/// weekday is 0-6 for Mon-Sun. +/// yearday is 1-366 +STATIC mp_obj_t time_localtime(uint n_args, const mp_obj_t *args) { + if (n_args == 0 || args[0] == mp_const_none) { + // get current date and time + // note: need to call get time then get date to correctly access the registers + RTC_DateTypeDef date; + RTC_TimeTypeDef time; + HAL_RTC_GetTime(&RTCHandle, &time, FORMAT_BIN); + HAL_RTC_GetDate(&RTCHandle, &date, FORMAT_BIN); + mp_obj_t tuple[8] = { + mp_obj_new_int(2000 + date.Year), + mp_obj_new_int(date.Month), + mp_obj_new_int(date.Date), + mp_obj_new_int(time.Hours), + mp_obj_new_int(time.Minutes), + mp_obj_new_int(time.Seconds), + mp_obj_new_int(date.WeekDay - 1), + mp_obj_new_int(mod_time_year_day(2000 + date.Year, date.Month, date.Date)), + }; + return mp_obj_new_tuple(8, tuple); + } + + mp_int_t seconds = mp_obj_get_int(args[0]); + mod_struct_time tm; + mod_time_seconds_since_2000_to_struct_time(seconds, &tm); mp_obj_t tuple[8] = { - mp_obj_new_int(2000 + date.Year), - mp_obj_new_int(date.Month), - mp_obj_new_int(date.Date), - mp_obj_new_int(time.Hours), - mp_obj_new_int(time.Minutes), - mp_obj_new_int(time.Seconds), - mp_obj_new_int(date.WeekDay - 1), - mp_obj_new_int(mod_time_year_day(2000 + date.Year, date.Month, date.Date)), + mp_obj_new_int(tm.tm_year), + mp_obj_new_int(tm.tm_mon), + mp_obj_new_int(tm.tm_mday), + mp_obj_new_int(tm.tm_hour), + mp_obj_new_int(tm.tm_min), + mp_obj_new_int(tm.tm_sec), + mp_obj_new_int(tm.tm_wday), + mp_obj_new_int(tm.tm_yday), }; return mp_obj_new_tuple(8, tuple); } -MP_DEFINE_CONST_FUN_OBJ_0(time_localtime_obj, time_localtime); +MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(time_localtime_obj, 0, 1, time_localtime); + + +/// \function mktime() +/// This is inverse function of localtime. It's argument is a full 8-tuple +/// which expresses a time as per localtime. It returns an integer which is +/// the number of seconds since Jan 1, 2000. +STATIC mp_obj_t time_mktime(mp_obj_t tuple) { + + uint len; + mp_obj_t *elem; + + mp_obj_get_array(tuple, &len, &elem); + + // localtime generates a tuple of len 8. CPython uses 9, so we accept both. + if (len < 8 || len > 9) { + nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "mktime needs a tuple of length 8 or 9 (%d given)", len)); + } + + mp_int_t year = mp_obj_get_int(elem[0]); + mp_int_t month = mp_obj_get_int(elem[1]); + mp_int_t mday = mp_obj_get_int(elem[2]); + mp_int_t hours = mp_obj_get_int(elem[3]); + mp_int_t minutes = mp_obj_get_int(elem[4]); + mp_int_t seconds = mp_obj_get_int(elem[5]); + + // Normalize the tuple. This allows things like: + // + // tm_tomorrow = list(time.localtime()) + // tm_tomorrow[2] += 1 # Adds 1 to mday + // tomorrow = time.mktime(tm_tommorrow) + // + // And not have to worry about all the weird overflows. + // + // You can subtract dates/times this way as well. + + minutes += seconds / 60; + if ((seconds = seconds % 60) < 0) { + seconds += 60; + minutes--; + } + + hours += minutes / 60; + if ((minutes = minutes % 60) < 0) { + minutes += 60; + hours--; + } + + mday += hours / 24; + if ((hours = hours % 24) < 0) { + hours += 24; + mday--; + } + + month--; // make month zero based + year += month / 12; + if ((month = month % 12) < 0) { + month += 12; + year--; + } + month++; // back to one based + + while (mday < 1) { + if (--month == 0) { + month = 12; + year--; + } + mday += days_in_month(year, month); + } + while (mday > days_in_month(year, month)) { + mday -= days_in_month(year, month); + if (++month == 13) { + month = 1; + year++; + } + } + return mp_obj_new_int_from_uint(mod_time_seconds_since_2000(year, month, mday, hours, minutes, seconds)); +} +MP_DEFINE_CONST_FUN_OBJ_1(time_mktime_obj, time_mktime); + /// \function sleep(seconds) /// Sleep for the given number of seconds. Seconds can be a floating-point number to @@ -127,6 +337,7 @@ STATIC const mp_map_elem_t time_module_globals_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_time) }, { MP_OBJ_NEW_QSTR(MP_QSTR_localtime), (mp_obj_t)&time_localtime_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_mktime), (mp_obj_t)&time_mktime_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_sleep), (mp_obj_t)&time_sleep_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_time), (mp_obj_t)&time_time_obj }, }; diff --git a/stmhal/qstrdefsport.h b/stmhal/qstrdefsport.h index d664597b75..53b385dbfa 100644 --- a/stmhal/qstrdefsport.h +++ b/stmhal/qstrdefsport.h @@ -265,6 +265,7 @@ Q(urandom) // for time module Q(time) Q(localtime) +Q(mktime) Q(sleep) // for input From 8ba832456e2e14db915e548a8ac3c6d4017c901e Mon Sep 17 00:00:00 2001 From: Damien George Date: Sun, 24 Aug 2014 17:40:24 +0100 Subject: [PATCH 2/2] stmhal, modtime: Small changes, reduced code size by around 80 bytes. Also added test for modtime. --- stmhal/modtime.c | 88 ++++++++++++++++++++-------------------- stmhal/portmodules.h | 1 - tests/pyb/modtime.py | 38 +++++++++++++++++ tests/pyb/modtime.py.exp | 34 ++++++++++++++++ 4 files changed, 117 insertions(+), 44 deletions(-) create mode 100644 tests/pyb/modtime.py create mode 100644 tests/pyb/modtime.py.exp diff --git a/stmhal/modtime.c b/stmhal/modtime.c index f6bde274ff..bbcb2a5fd6 100644 --- a/stmhal/modtime.c +++ b/stmhal/modtime.c @@ -36,21 +36,6 @@ #include "portmodules.h" #include "rtc.h" -#define DAYS_PER_400Y (365*400 + 97) -#define DAYS_PER_100Y (365*100 + 24) -#define DAYS_PER_4Y (365*4 + 1) - -typedef struct { - 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 -} mod_struct_time; - /// \module time - time related functions /// /// The `time` module provides functions for getting the current time and date, @@ -63,7 +48,7 @@ STATIC bool is_leap_year(mp_uint_t year) { } // Month is one based -STATIC mp_uint_t days_in_month(mp_uint_t year, mp_uint_t month) { +STATIC mp_uint_t mod_time_days_in_month(mp_uint_t year, mp_uint_t month) { mp_uint_t mdays = days_since_jan1[month] - days_since_jan1[month - 1]; if (month == 2 && is_leap_year(year)) { mdays++; @@ -73,7 +58,7 @@ STATIC mp_uint_t days_in_month(mp_uint_t year, mp_uint_t month) { // compute the day of the year, between 1 and 366 // month should be between 1 and 12, date should start at 1 -mp_uint_t mod_time_year_day(mp_uint_t year, mp_uint_t month, mp_uint_t date) { +STATIC mp_uint_t mod_time_year_day(mp_uint_t year, mp_uint_t month, mp_uint_t date) { mp_uint_t yday = days_since_jan1[month - 1] + date; if (month >= 3 && is_leap_year(year)) { yday += 1; @@ -102,11 +87,24 @@ mp_uint_t mod_time_seconds_since_2000(mp_uint_t year, mp_uint_t month, mp_uint_t #define LEAPOCH ((31 + 29) * 86400) -void mod_time_seconds_since_2000_to_struct_time(mp_uint_t t, mod_struct_time *tm) { - memset(tm, 0, sizeof(*tm)); +#define DAYS_PER_400Y (365*400 + 97) +#define DAYS_PER_100Y (365*100 + 24) +#define DAYS_PER_4Y (365*4 + 1) +typedef struct { + 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 +} mod_struct_time; + +STATIC void mod_time_seconds_since_2000_to_struct_time(mp_uint_t t, mod_struct_time *tm) { // The following algorithm was adapted from musl's __secs_to_tm and adapted - // for differences in MicroPython's timebase. + // for differences in Micro Python's timebase. mp_int_t seconds = t - LEAPOCH; @@ -146,6 +144,7 @@ void mod_time_seconds_since_2000_to_struct_time(mp_uint_t t, mod_struct_time *tm } days -= (years * 365); + /* We will compute tm_yday at the very end mp_int_t leap = !years && (q_cycles || !c_cycles); tm->tm_yday = days + 31 + 28 + leap; @@ -153,10 +152,13 @@ void mod_time_seconds_since_2000_to_struct_time(mp_uint_t t, mod_struct_time *tm tm->tm_yday -= 365 + leap; } + tm->tm_yday++; // Make one based + */ + tm->tm_year = 2000 + years + 4 * q_cycles + 100 * c_cycles + 400 * qc_cycles; // Note: days_in_month[0] corresponds to March - static const int8_t days_in_month[] = {31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 31, 29}; + STATIC const int8_t days_in_month[] = {31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 31, 29}; mp_int_t month; for (month = 0; days_in_month[month] <= days; month++) { @@ -170,9 +172,9 @@ void mod_time_seconds_since_2000_to_struct_time(mp_uint_t t, mod_struct_time *tm } tm->tm_mday = days + 1; // Make one based tm->tm_mon++; // Make one based - tm->tm_yday++; // Make one based -} + tm->tm_yday = mod_time_year_day(tm->tm_year, tm->tm_mon, tm->tm_mday); +} /// \function localtime([secs]) /// Convert a time expressed in seconds since Jan 1, 2000 into an 8-tuple which @@ -205,22 +207,22 @@ STATIC mp_obj_t time_localtime(uint n_args, const mp_obj_t *args) { mp_obj_new_int(mod_time_year_day(2000 + date.Year, date.Month, date.Date)), }; return mp_obj_new_tuple(8, tuple); + } else { + mp_int_t seconds = mp_obj_get_int(args[0]); + mod_struct_time tm; + mod_time_seconds_since_2000_to_struct_time(seconds, &tm); + mp_obj_t tuple[8] = { + tuple[0] = mp_obj_new_int(tm.tm_year), + tuple[1] = mp_obj_new_int(tm.tm_mon), + tuple[2] = mp_obj_new_int(tm.tm_mday), + tuple[3] = mp_obj_new_int(tm.tm_hour), + tuple[4] = mp_obj_new_int(tm.tm_min), + tuple[5] = mp_obj_new_int(tm.tm_sec), + tuple[6] = mp_obj_new_int(tm.tm_wday), + tuple[7] = mp_obj_new_int(tm.tm_yday), + }; + return mp_obj_new_tuple(8, tuple); } - - mp_int_t seconds = mp_obj_get_int(args[0]); - mod_struct_time tm; - mod_time_seconds_since_2000_to_struct_time(seconds, &tm); - mp_obj_t tuple[8] = { - mp_obj_new_int(tm.tm_year), - mp_obj_new_int(tm.tm_mon), - mp_obj_new_int(tm.tm_mday), - mp_obj_new_int(tm.tm_hour), - mp_obj_new_int(tm.tm_min), - mp_obj_new_int(tm.tm_sec), - mp_obj_new_int(tm.tm_wday), - mp_obj_new_int(tm.tm_yday), - }; - return mp_obj_new_tuple(8, tuple); } MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(time_localtime_obj, 0, 1, time_localtime); @@ -248,12 +250,12 @@ STATIC mp_obj_t time_mktime(mp_obj_t tuple) { mp_int_t minutes = mp_obj_get_int(elem[4]); mp_int_t seconds = mp_obj_get_int(elem[5]); - // Normalize the tuple. This allows things like: + // Normalise the tuple. This allows things like: // // tm_tomorrow = list(time.localtime()) // tm_tomorrow[2] += 1 # Adds 1 to mday // tomorrow = time.mktime(tm_tommorrow) - // + // // And not have to worry about all the weird overflows. // // You can subtract dates/times this way as well. @@ -289,10 +291,10 @@ STATIC mp_obj_t time_mktime(mp_obj_t tuple) { month = 12; year--; } - mday += days_in_month(year, month); + mday += mod_time_days_in_month(year, month); } - while (mday > days_in_month(year, month)) { - mday -= days_in_month(year, month); + while (mday > mod_time_days_in_month(year, month)) { + mday -= mod_time_days_in_month(year, month); if (++month == 13) { month = 1; year++; diff --git a/stmhal/portmodules.h b/stmhal/portmodules.h index d8a3d8f879..491df6bc49 100644 --- a/stmhal/portmodules.h +++ b/stmhal/portmodules.h @@ -31,5 +31,4 @@ extern const mp_obj_module_t time_module; // additional helper functions exported by the modules -mp_uint_t mod_time_year_day(mp_uint_t year, mp_uint_t month, mp_uint_t date); mp_uint_t mod_time_seconds_since_2000(mp_uint_t year, mp_uint_t month, mp_uint_t date, mp_uint_t hour, mp_uint_t minute, mp_uint_t second); diff --git a/tests/pyb/modtime.py b/tests/pyb/modtime.py new file mode 100644 index 0000000000..de6f8fbc6b --- /dev/null +++ b/tests/pyb/modtime.py @@ -0,0 +1,38 @@ +import time + +DAYS_PER_MONTH = [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31] + +def is_leap(year): + return (year % 4) == 0 + +def test(): + seconds = 0 + wday = 5 # Jan 1, 2000 was a Saturday + for year in range(2000, 2034): + print("Testing %d" % year) + yday = 1 + for month in range(1, 13): + if month == 2 and is_leap(year): + DAYS_PER_MONTH[2] = 29 + else: + DAYS_PER_MONTH[2] = 28 + for day in range(1, DAYS_PER_MONTH[month] + 1): + secs = time.mktime((year, month, day, 0, 0, 0, 0, 0)) + if secs != seconds: + print("mktime failed for %d-%02d-%02d got %d expected %d" % (year, month, day, secs, seconds)) + tuple = time.localtime(seconds) + secs = time.mktime(tuple) + if secs != seconds: + print("localtime failed for %d-%02d-%02d got %d expected %d" % (year, month, day, secs, seconds)) + return + seconds += 86400 + if yday != tuple[7]: + print("locatime for %d-%02d-%02d got yday %d, expecting %d" % (year, month, day, tuple[7], yday)) + return + if wday != tuple[6]: + print("locatime for %d-%02d-%02d got wday %d, expecting %d" % (year, month, day, tuple[6], wday)) + return + yday += 1 + wday = (wday + 1) % 7 + +test() diff --git a/tests/pyb/modtime.py.exp b/tests/pyb/modtime.py.exp new file mode 100644 index 0000000000..0bf7c43f98 --- /dev/null +++ b/tests/pyb/modtime.py.exp @@ -0,0 +1,34 @@ +Testing 2000 +Testing 2001 +Testing 2002 +Testing 2003 +Testing 2004 +Testing 2005 +Testing 2006 +Testing 2007 +Testing 2008 +Testing 2009 +Testing 2010 +Testing 2011 +Testing 2012 +Testing 2013 +Testing 2014 +Testing 2015 +Testing 2016 +Testing 2017 +Testing 2018 +Testing 2019 +Testing 2020 +Testing 2021 +Testing 2022 +Testing 2023 +Testing 2024 +Testing 2025 +Testing 2026 +Testing 2027 +Testing 2028 +Testing 2029 +Testing 2030 +Testing 2031 +Testing 2032 +Testing 2033