From 9e6cca66b46c1ef616fd5d75f6b9201ac9c4bb78 Mon Sep 17 00:00:00 2001 From: Glenn Ruben Bakke Date: Mon, 8 May 2017 23:09:15 +0200 Subject: [PATCH] nrf5/modules/timer: Adding timer module to modmachine. --- nrf5/modules/machine/modmachine.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nrf5/modules/machine/modmachine.c b/nrf5/modules/machine/modmachine.c index 5e24ca9cd1..11ce93e628 100644 --- a/nrf5/modules/machine/modmachine.c +++ b/nrf5/modules/machine/modmachine.c @@ -41,6 +41,7 @@ #include "uart.h" #include "spi.h" #include "i2c.h" +#include "timer.h" #if MICROPY_PY_MACHINE_HW_PWM #include "pwm.h" #endif @@ -213,11 +214,14 @@ STATIC const mp_map_elem_t machine_module_globals_table[] = { #if MICROPY_PY_MACHINE_RTC { MP_OBJ_NEW_QSTR(MP_QSTR_RTC), (mp_obj_t)&machine_rtc_type }, #endif +#if MICROPY_PY_MACHINE_TIMER + { MP_OBJ_NEW_QSTR(MP_QSTR_Timer), (mp_obj_t)&machine_timer_type }, +#endif #if MICROPY_PY_MACHINE_HW_PWM { MP_OBJ_NEW_QSTR(MP_QSTR_PWM), (mp_obj_t)&machine_hard_pwm_type }, #endif #if MICROPY_PY_MACHINE_TEMP - { MP_OBJ_NEW_QSTR(MP_QSTR_Temp), (mp_obj_t)&machine_temp_type }, + { MP_OBJ_NEW_QSTR(MP_QSTR_Temp), (mp_obj_t)&machine_temp_type }, #endif { MP_OBJ_NEW_QSTR(MP_QSTR_HARD_RESET), MP_OBJ_NEW_SMALL_INT(PYB_RESET_HARD) }, { MP_OBJ_NEW_QSTR(MP_QSTR_WDT_RESET), MP_OBJ_NEW_SMALL_INT(PYB_RESET_WDT) },