From f25e2db04c8910b673b4b2c0d7e04636b919b0ad Mon Sep 17 00:00:00 2001
From: ch3 <ch3@mailbox.org>
Date: Thu, 6 Jun 2019 20:44:23 +0200
Subject: [PATCH] Add time module
---
ports/card10/Makefile | 7 ++++-
ports/card10/modutime.c | 56 +++++++++++++++++++++++++++++++++++++
ports/card10/mpconfigport.h | 1 +
ports/card10/qstrdefsport.h | 0
ports/card10/systick.c | 17 +++++++++++
5 files changed, 80 insertions(+), 1 deletion(-)
create mode 100644 ports/card10/modutime.c
create mode 100644 ports/card10/qstrdefsport.h
create mode 100644 ports/card10/systick.c
diff --git a/ports/card10/Makefile b/ports/card10/Makefile
index 85382c042..0f4e40081 100644
--- a/ports/card10/Makefile
+++ b/ports/card10/Makefile
@@ -1,7 +1,7 @@
include ../../py/mkenv.mk
# qstr definitions (must come before including py.mk)
-# QSTR_DEFS = qstrdefsport.h
+QSTR_DEFS = qstrdefsport.h
# include py core make definitions
include $(TOP)/py/py.mk
@@ -44,6 +44,8 @@ LIBS =
SRC_C = \
main.c \
uart_core.c \
+ modutime.c \
+ systick.c \
lib/utils/printf.c \
lib/utils/stdout_helpers.c \
lib/utils/pyexec.c \
@@ -52,6 +54,9 @@ SRC_C = \
OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
+SRC_QSTR += $(SRC_C)
+USER_C_MODULES += modutime.c
+
# SDK compilation hack
# -----------------------------------------------------------------------------
diff --git a/ports/card10/modutime.c b/ports/card10/modutime.c
new file mode 100644
index 000000000..7004673cc
--- /dev/null
+++ b/ports/card10/modutime.c
@@ -0,0 +1,56 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 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
+ * 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 <stdio.h>
+#include <string.h>
+
+#include "py/runtime.h"
+#include "py/smallint.h"
+#include "py/obj.h"
+#include "lib/timeutils/timeutils.h"
+#include "extmod/utime_mphal.h"
+
+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), 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) },
+};
+
+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,
+};
+
+// Register the module to make it available in Python
+MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, MODULE_UTIME_ENABLED);
diff --git a/ports/card10/mpconfigport.h b/ports/card10/mpconfigport.h
index 3faa728ef..05061e37e 100644
--- a/ports/card10/mpconfigport.h
+++ b/ports/card10/mpconfigport.h
@@ -59,6 +59,7 @@
#define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_LONGLONG)
#define MICROPY_FLOAT_IMPL (MICROPY_FLOAT_IMPL_FLOAT)
#define MICROPY_PY_UTIME_MP_HAL (1)
+#define MODULE_UTIME_ENABLED (1)
// type definitions for the specific machine
diff --git a/ports/card10/qstrdefsport.h b/ports/card10/qstrdefsport.h
new file mode 100644
index 000000000..e69de29bb
diff --git a/ports/card10/systick.c b/ports/card10/systick.c
new file mode 100644
index 000000000..147bc0322
--- /dev/null
+++ b/ports/card10/systick.c
@@ -0,0 +1,17 @@
+#include "py/mpconfig.h"
+
+void mp_hal_delay_ms(mp_uint_t ms) {
+ mxc_delay (ms * 1000); // TODO check return value
+}
+
+void mp_hal_delay_us(mp_uint_t us) {
+ mxc_delay (us); // TODO check return value
+}
+
+mp_uint_t mp_hal_ticks_ms(void) {}
+
+mp_uint_t mp_hal_ticks_us(void) {}
+
+mp_uint_t mp_hal_ticks_cpu(void) {}
+
+
--
GitLab