From 322c53bbc983768b8ee4fa2a3d6ad7f868b543e6 Mon Sep 17 00:00:00 2001 From: Damien George Date: Fri, 10 Mar 2023 12:21:43 +1100 Subject: [PATCH] renesas-ra/modutime: Use extmod version of time module. No API or functional change. Signed-off-by: Damien George --- ports/renesas-ra/Makefile | 1 - ports/renesas-ra/modutime.c | 130 ++++++-------------------------- ports/renesas-ra/mpconfigport.h | 7 +- 3 files changed, 26 insertions(+), 112 deletions(-) diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile index f0b1e1ed75..8dd172b50c 100644 --- a/ports/renesas-ra/Makefile +++ b/ports/renesas-ra/Makefile @@ -318,7 +318,6 @@ SRC_C += \ machine_pin.c \ machine_rtc.c \ modmachine.c \ - modutime.c \ extint.c \ usrsw.c \ flash.c \ diff --git a/ports/renesas-ra/modutime.c b/ports/renesas-ra/modutime.c index 374ab12460..49dcfd589d 100644 --- a/ports/renesas-ra/modutime.c +++ b/ports/renesas-ra/modutime.c @@ -3,7 +3,7 @@ * * The MIT License (MIT) * - * Copyright (c) 2013, 2014 Damien P. George + * Copyright (c) 2013-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 @@ -24,118 +24,34 @@ * THE SOFTWARE. */ -#include -#include - -#include "py/runtime.h" -#include "py/smallint.h" #include "py/obj.h" #include "shared/timeutils/timeutils.h" -#include "extmod/modutime.h" -#include "systick.h" #include "rtc.h" -#if MICROPY_PY_UTIME - -/// \module time - time related functions -/// -/// The `time` module provides functions for getting the current time and date, -/// and for sleeping. - -/// \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(size_t 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_init_finalise(); - // RTC_DateTypeDef date; - // RTC_TimeTypeDef time; - // HAL_RTC_GetTime(&RTCHandle, &time, RTC_FORMAT_BIN); - // HAL_RTC_GetDate(&RTCHandle, &date, RTC_FORMAT_BIN); - ra_rtc_t time; - ra_rtc_get_time(&time); - mp_obj_t tuple[8] = { - mp_obj_new_int(time.year), - mp_obj_new_int(time.month), - mp_obj_new_int(time.date), - mp_obj_new_int(time.hour), - mp_obj_new_int(time.minute), - mp_obj_new_int(time.second), - mp_obj_new_int(time.weekday - 1), - mp_obj_new_int(timeutils_year_day(time.year, time.month, time.date)), - }; - return mp_obj_new_tuple(8, tuple); - } else { - mp_int_t seconds = mp_obj_get_int(args[0]); - timeutils_struct_time_t tm; - timeutils_seconds_since_epoch_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_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(time_localtime_obj, 0, 1, time_localtime); - -/// \function time() -/// Returns the number of seconds, as an integer, since 1/1/2000. -STATIC mp_obj_t time_time(void) { - // get date and time - // note: need to call get time then get date to correctly access the registers +// Return the localtime as an 8-tuple. +STATIC mp_obj_t mp_utime_localtime_get(void) { + // get current date and time + rtc_init_finalise(); + ra_rtc_t time; + ra_rtc_get_time(&time); + mp_obj_t tuple[8] = { + mp_obj_new_int(time.year), + mp_obj_new_int(time.month), + mp_obj_new_int(time.date), + mp_obj_new_int(time.hour), + mp_obj_new_int(time.minute), + mp_obj_new_int(time.second), + mp_obj_new_int(time.weekday - 1), + mp_obj_new_int(timeutils_year_day(time.year, time.month, time.date)), + }; + return mp_obj_new_tuple(8, tuple); +} + +// Returns the number of seconds, as an integer, since the Epoch. +STATIC mp_obj_t mp_utime_time_get(void) { + // get date and time rtc_init_finalise(); - // RTC_DateTypeDef date; - // RTC_TimeTypeDef time; - // HAL_RTC_GetTime(&RTCHandle, &time, RTC_FORMAT_BIN); - // HAL_RTC_GetDate(&RTCHandle, &date, RTC_FORMAT_BIN); ra_rtc_t time; ra_rtc_get_time(&time); return mp_obj_new_int(timeutils_seconds_since_epoch(time.year, time.month, time.date, time.hour, time.minute, time.second)); } -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 mp_module_utime = { - .base = { &mp_type_module }, - .globals = (mp_obj_dict_t *)&time_module_globals, -}; - -MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime); - -#endif // MICROPY_PY_UTIME diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h index 6d40ac8fac..7dbe941c0e 100644 --- a/ports/renesas-ra/mpconfigport.h +++ b/ports/renesas-ra/mpconfigport.h @@ -99,10 +99,9 @@ #define MICROPY_PY_UOS_SYNC (1) #define MICROPY_PY_UOS_UNAME (1) #define MICROPY_PY_UOS_URANDOM (MICROPY_HW_ENABLE_RNG) -#ifndef MICROPY_PY_UTIME -#define MICROPY_PY_UTIME (1) -#endif -#define MICROPY_PY_UTIME_MP_HAL (MICROPY_PY_UTIME) +#define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME (1) +#define MICROPY_PY_UTIME_TIME_TIME_NS (1) +#define MICROPY_PY_UTIME_INCLUDEFILE "ports/renesas-ra/modutime.c" #ifndef MICROPY_PY_UTIMEQ #define MICROPY_PY_UTIMEQ (1) #endif