samd/modutime: Use extmod version of time module.

No API or functional change.

Signed-off-by: Damien George <[email protected]>

Author: dpgeorge

ports/samd/Makefile

@@ -103,7 +103,6 @@ SRC_C += \
 	machine_uart.c \
 	machine_wdt.c \
 	main.c \
-	modutime.c \
 	modmachine.c \
 	modsamd.c \
 	mphalport.c \

ports/samd/mcu/samd21/mpconfigmcu.h

@@ -14,6 +14,10 @@
 #define MICROPY_PY_BUILTINS_COMPLEX     (0)
 #endif
 
+#ifndef MICROPY_PY_UTIME
+#define MICROPY_PY_UTIME                (1)
+#endif
+
 #ifndef MICROPY_PY_MATH
 #define MICROPY_PY_MATH                 (1)
 #endif

ports/samd/modutime.c

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2019 Damien P. George
+ * Copyright (c) 2019-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,68 +24,33 @@
  * THE SOFTWARE.
  */
 
-#include "py/runtime.h"
-#include "extmod/modutime.h"
+#include "py/obj.h"
 #include "shared/timeutils/timeutils.h"
 #include "modmachine.h"
 
-// localtime([secs])
-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) {
     timeutils_struct_time_t tm;
-    mp_int_t seconds;
-
-    if (n_args == 0 || args[0] == mp_const_none) {
-        rtc_gettime(&tm);
-    } else {
-        seconds = mp_obj_get_int(args[0]);
-        timeutils_seconds_since_epoch_to_struct_time(seconds, &tm);
-    }
-
+    rtc_gettime(&tm);
+    tm.tm_wday = timeutils_calc_weekday(tm.tm_year, tm.tm_mon, tm.tm_mday);
+    tm.tm_yday = timeutils_year_day(tm.tm_year, tm.tm_mon, tm.tm_mday);
     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(timeutils_calc_weekday(tm.tm_year, tm.tm_mon, tm.tm_mday)),
-        tuple[7] = mp_obj_new_int(timeutils_year_day(tm.tm_year, tm.tm_mon, tm.tm_mday)),
+        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);
 
-// time()
-STATIC mp_obj_t time_time(void) {
+// Returns the number of seconds, as an integer, since the Epoch.
+STATIC mp_obj_t mp_utime_time_get(void) {
     timeutils_struct_time_t tm;
     rtc_gettime(&tm);
     return mp_obj_new_int_from_uint(timeutils_mktime(
         tm.tm_year, tm.tm_mon, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec));
 }
-STATIC 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_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), MP_ROM_PTR(&time_time_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);

ports/samd/mpconfigport.h

@@ -78,7 +78,9 @@
 #define MICROPY_PY_IO_IOBASE                (1)
 
 // Extended modules
-#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/samd/modutime.c"
 #define MICROPY_PY_MACHINE                  (1)
 #define MICROPY_PY_UOS                      (1)
 #define MICROPY_PY_UOS_INCLUDEFILE          "ports/samd/moduos.c"