From 5be20b67df5d83d2a9b2301e71a769d3932612f8 Mon Sep 17 00:00:00 2001 From: Damien George Date: Fri, 10 Mar 2023 12:20:16 +1100 Subject: [PATCH] esp32/modutime: Use extmod version of time module. No API or functional change. Signed-off-by: Damien George --- ports/esp32/main/CMakeLists.txt | 1 - ports/esp32/modutime.c | 54 ++++++--------------------------- ports/esp32/mpconfigport.h | 4 ++- 3 files changed, 12 insertions(+), 47 deletions(-) diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt index f8acfa9052..964720dd9e 100644 --- a/ports/esp32/main/CMakeLists.txt +++ b/ports/esp32/main/CMakeLists.txt @@ -56,7 +56,6 @@ set(MICROPY_SOURCE_PORT ${PROJECT_DIR}/mphalport.c ${PROJECT_DIR}/fatfs_port.c ${PROJECT_DIR}/help.c - ${PROJECT_DIR}/modutime.c ${PROJECT_DIR}/machine_bitstream.c ${PROJECT_DIR}/machine_timer.c ${PROJECT_DIR}/machine_pin.c diff --git a/ports/esp32/modutime.c b/ports/esp32/modutime.c index 7a0b44d59c..7b833a194d 100644 --- a/ports/esp32/modutime.c +++ b/ports/esp32/modutime.c @@ -5,7 +5,7 @@ * * The MIT License (MIT) * - * Copyright (c) 2016 Damien P. George + * Copyright (c) 2016-2023 Damien P. George * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -26,25 +26,17 @@ * THE SOFTWARE. */ -#include -#include #include -#include "py/runtime.h" +#include "py/obj.h" #include "shared/timeutils/timeutils.h" -#include "extmod/modutime.h" -STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) { +// Return the localtime as an 8-tuple. +STATIC mp_obj_t mp_utime_localtime_get(void) { + struct timeval tv; + gettimeofday(&tv, NULL); 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_epoch_to_struct_time(seconds, &tm); + timeutils_seconds_since_epoch_to_struct_time(tv.tv_sec, &tm); mp_obj_t tuple[8] = { tuple[0] = mp_obj_new_int(tm.tm_year), tuple[1] = mp_obj_new_int(tm.tm_mon), @@ -57,38 +49,10 @@ STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) { }; 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_time(void) { +// Return the number of seconds since the Epoch. +STATIC mp_obj_t mp_utime_time_get(void) { struct timeval tv; gettimeofday(&tv, NULL); return mp_obj_new_int(tv.tv_sec); } -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_gmtime), MP_ROM_PTR(&time_localtime_obj) }, - { MP_ROM_QSTR(MP_QSTR_localtime), MP_ROM_PTR(&time_localtime_obj) }, - { MP_ROM_QSTR(MP_QSTR_mktime), MP_ROM_PTR(&mp_utime_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) }, - { MP_ROM_QSTR(MP_QSTR_sleep_us), MP_ROM_PTR(&mp_utime_sleep_us_obj) }, - { MP_ROM_QSTR(MP_QSTR_ticks_ms), MP_ROM_PTR(&mp_utime_ticks_ms_obj) }, - { MP_ROM_QSTR(MP_QSTR_ticks_us), MP_ROM_PTR(&mp_utime_ticks_us_obj) }, - { MP_ROM_QSTR(MP_QSTR_ticks_cpu), MP_ROM_PTR(&mp_utime_ticks_cpu_obj) }, - { MP_ROM_QSTR(MP_QSTR_ticks_add), MP_ROM_PTR(&mp_utime_ticks_add_obj) }, - { MP_ROM_QSTR(MP_QSTR_ticks_diff), MP_ROM_PTR(&mp_utime_ticks_diff_obj) }, - { MP_ROM_QSTR(MP_QSTR_time_ns), MP_ROM_PTR(&mp_utime_time_ns_obj) }, -}; - -STATIC MP_DEFINE_CONST_DICT(time_module_globals, time_module_globals_table); - -const mp_obj_module_t utime_module = { - .base = { &mp_type_module }, - .globals = (mp_obj_dict_t *)&time_module_globals, -}; - -MP_REGISTER_MODULE(MP_QSTR_utime, utime_module); diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h index 94daa2caa1..845c7e8fd7 100644 --- a/ports/esp32/mpconfigport.h +++ b/ports/esp32/mpconfigport.h @@ -62,7 +62,9 @@ #define MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS (1) #define MICROPY_PY_BUILTINS_HELP_TEXT esp32_help_text #define MICROPY_PY_IO_BUFFEREDWRITER (1) -#define MICROPY_PY_UTIME_MP_HAL (1) +#define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME (1) +#define MICROPY_PY_UTIME_TIME_TIME_NS (1) +#define MICROPY_PY_UTIME_INCLUDEFILE "ports/esp32/modutime.c" #define MICROPY_PY_THREAD (1) #define MICROPY_PY_THREAD_GIL (1) #define MICROPY_PY_THREAD_GIL_VM_DIVISOR (32)