From a3c427898e5ba375b390d80d57d751c4d474dd6f Mon Sep 17 00:00:00 2001 From: Damien George Date: Fri, 10 Mar 2023 12:21:18 +1100 Subject: [PATCH] nrf/modules/utime: Use extmod version of time module. API additions; - time.sleep() is added - time.ticks_cpu() is added, but it just returns 0 No API or functional change to existing time functions. Signed-off-by: Damien George --- ports/nrf/Makefile | 1 - ports/nrf/modules/utime/modutime.c | 58 ------------------------------ ports/nrf/mpconfigport.h | 2 +- 3 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 ports/nrf/modules/utime/modutime.c diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile index 54b69b6370..54701adacb 100644 --- a/ports/nrf/Makefile +++ b/ports/nrf/Makefile @@ -331,7 +331,6 @@ DRIVERS_SRC_C += $(addprefix modules/,\ machine/temp.c \ uos/moduos.c \ uos/microbitfs.c \ - utime/modutime.c \ board/modboard.c \ board/led.c \ ubluepy/modubluepy.c \ diff --git a/ports/nrf/modules/utime/modutime.c b/ports/nrf/modules/utime/modutime.c deleted file mode 100644 index b43f7f9181..0000000000 --- a/ports/nrf/modules/utime/modutime.c +++ /dev/null @@ -1,58 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2016 Glenn Ruben Bakke - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include -#include - -#include "py/nlr.h" -#include "py/smallint.h" -#include "py/obj.h" -#include "extmod/modutime.h" - -/// \module time - time related functions -/// -/// The `time` module provides functions for getting the current time and date, -/// and for sleeping. - -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_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_add), MP_ROM_PTR(&mp_utime_ticks_add_obj) }, - { MP_ROM_QSTR(MP_QSTR_ticks_diff), MP_ROM_PTR(&mp_utime_ticks_diff_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); diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h index 8875e3faaf..a3ceb023ee 100644 --- a/ports/nrf/mpconfigport.h +++ b/ports/nrf/mpconfigport.h @@ -158,7 +158,7 @@ #define MICROPY_PY_SYS_MAXSIZE (1) #define MICROPY_PY_URANDOM (1) #define MICROPY_PY_URANDOM_EXTRA_FUNCS (1) -#define MICROPY_PY_UTIME_MP_HAL (1) +#define MICROPY_PY_UTIME (1) #define MICROPY_PY_MACHINE (1) #define MICROPY_PY_MACHINE_PULSE (0) #define MICROPY_PY_MACHINE_SOFTI2C (MICROPY_PY_MACHINE_I2C)