summaryrefslogtreecommitdiff
path: root/esp8266/modpyb.c
diff options
context:
space:
mode:
authorJosef Gajdusek <atx@atx.name>2015-05-10 17:54:09 +0200
committerDamien George <damien.p.george@gmail.com>2015-05-12 23:47:18 +0100
commit800d5cd16f2e153a2dfc750c507f5a82d17491d7 (patch)
treecbfeda8e66708ea70aceba82d3dfb6b13e53f38e /esp8266/modpyb.c
parentc7df9c6c47855adcfd204100098e355358935dc3 (diff)
esp8266: Implement time functions
Diffstat (limited to 'esp8266/modpyb.c')
-rw-r--r--esp8266/modpyb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/esp8266/modpyb.c b/esp8266/modpyb.c
index 14dfebd33..57d0a6a9f 100644
--- a/esp8266/modpyb.c
+++ b/esp8266/modpyb.c
@@ -108,13 +108,13 @@ STATIC mp_obj_t pyb_elapsed_millis(mp_obj_t start) {
STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_elapsed_millis_obj, pyb_elapsed_millis);
STATIC mp_obj_t pyb_micros(void) {
- return MP_OBJ_NEW_SMALL_INT(0);
+ return MP_OBJ_NEW_SMALL_INT(system_get_time());
}
STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_micros_obj, pyb_micros);
STATIC mp_obj_t pyb_elapsed_micros(mp_obj_t start) {
uint32_t startMicros = mp_obj_get_int(start);
- uint32_t currMicros = 0;
+ uint32_t currMicros = system_get_time();
return MP_OBJ_NEW_SMALL_INT((currMicros - startMicros) & 0x3fffffff);
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_elapsed_micros_obj, pyb_elapsed_micros);