summaryrefslogtreecommitdiff
path: root/pic16bit/modpyb.c
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2015-10-30 23:03:58 +0000
committerPaul Sokolovsky <pfalcon@users.sourceforge.net>2015-10-31 19:14:30 +0300
commit731f359292c0e2630873df1a19c5baac7287024f (patch)
tree3aef09fd15b82baa9fff7c72fe3bc7e05a869614 /pic16bit/modpyb.c
parent0bd3f3291d3ea0252a91653a1edcbfa83d524834 (diff)
all: Add py/mphal.h and use it in all ports.
py/mphal.h contains declarations for generic mp_hal_XXX functions, such as stdio and delay/ticks, which ports should provide definitions for. A port will also provide mphalport.h with further HAL declarations.
Diffstat (limited to 'pic16bit/modpyb.c')
-rw-r--r--pic16bit/modpyb.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/pic16bit/modpyb.c b/pic16bit/modpyb.c
index f632d9443..f59163a69 100644
--- a/pic16bit/modpyb.c
+++ b/pic16bit/modpyb.c
@@ -27,17 +27,17 @@
#include <stdio.h>
#include "py/obj.h"
-#include MICROPY_HAL_H
+#include "py/mphal.h"
#include "modpyb.h"
STATIC mp_obj_t pyb_millis(void) {
- return MP_OBJ_NEW_SMALL_INT(mp_hal_get_milliseconds());
+ return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_ms());
}
STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_millis_obj, pyb_millis);
STATIC mp_obj_t pyb_elapsed_millis(mp_obj_t start) {
uint32_t startMillis = mp_obj_get_int(start);
- uint32_t currMillis = mp_hal_get_milliseconds();
+ uint32_t currMillis = mp_hal_ticks_ms();
return MP_OBJ_NEW_SMALL_INT((currMillis - startMillis) & 0x1fff);
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_elapsed_millis_obj, pyb_elapsed_millis);
@@ -45,7 +45,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_elapsed_millis_obj, pyb_elapsed_millis);
STATIC mp_obj_t pyb_delay(mp_obj_t ms_in) {
mp_int_t ms = mp_obj_get_int(ms_in);
if (ms >= 0) {
- mp_hal_milli_delay(ms);
+ mp_hal_delay_ms(ms);
}
return mp_const_none;
}