aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Moore2017-10-19 11:01:53 +1100
committerDamien George2017-12-13 14:48:53 +1100
commitf0628f5499774817ccbf34e66b22c56ec8e68a90 (patch)
tree40b353aa70e1ed324dc1bc3391f80e4a6524813e
parentba2d960276083c12b2ccf6f431064ab4a073a73d (diff)
esp32/modutime.c: Add localtime and mktime functions.
-rw-r--r--ports/esp32/modutime.c45
1 files changed, 45 insertions, 0 deletions
diff --git a/ports/esp32/modutime.c b/ports/esp32/modutime.c
index f037faad9..002854298 100644
--- a/ports/esp32/modutime.c
+++ b/ports/esp32/modutime.c
@@ -30,8 +30,51 @@
#include <string.h>
#include <sys/time.h>
+#include "py/runtime.h"
+#include "lib/timeutils/timeutils.h"
#include "extmod/utime_mphal.h"
+STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {
+ timeutils_struct_time_t tm;
+ mp_int_t seconds;
+ if (n_args == 0 || args[0] == mp_const_none) {
+ struct timeval tv;
+ gettimeofday(&tv, NULL);
+ seconds = tv.tv_sec;
+ } else {
+ seconds = mp_obj_get_int(args[0]);
+ }
+ timeutils_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);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(time_localtime_obj, 0, 1, time_localtime);
+
+STATIC mp_obj_t time_mktime(mp_obj_t tuple) {
+ size_t 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));
+ }
+
+ return mp_obj_new_int_from_uint(timeutils_mktime(mp_obj_get_int(elem[0]),
+ mp_obj_get_int(elem[1]), mp_obj_get_int(elem[2]), mp_obj_get_int(elem[3]),
+ mp_obj_get_int(elem[4]), mp_obj_get_int(elem[5])));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(time_mktime_obj, time_mktime);
+
STATIC mp_obj_t time_time(void) {
struct timeval tv;
gettimeofday(&tv, NULL);
@@ -42,6 +85,8 @@ MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time);
STATIC const mp_rom_map_elem_t time_module_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_utime) },
+ { MP_ROM_QSTR(MP_QSTR_localtime), MP_ROM_PTR(&time_localtime_obj) },
+ { MP_ROM_QSTR(MP_QSTR_mktime), MP_ROM_PTR(&time_mktime_obj) },
{ MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&time_time_obj) },
{ MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&mp_utime_sleep_obj) },
{ MP_ROM_QSTR(MP_QSTR_sleep_ms), MP_ROM_PTR(&mp_utime_sleep_ms_obj) },