esp8266: Implement time functions

atx · dpgeorge · commit 800d5cd16f2e · 2015-05-12T23:47:18.000+01:00
diff --git a/esp8266/esp_mphal.c b/esp8266/esp_mphal.c
@@ -29,6 +29,7 @@
 #include "etshal.h"
 #include "uart.h"
 #include "esp_mphal.h"
+#include "user_interface.h"
 
 extern void ets_wdt_disable(void);
 extern void wdt_feed(void);
@@ -82,8 +83,7 @@ void mp_hal_stdout_tx_strn_cooked(const char *str, uint32_t len) {
 }
 
 uint32_t HAL_GetTick(void) {
-    // TODO
-    return 0;
+    return system_get_time() / 1000;
 }
 
 void HAL_Delay(uint32_t Delay) {
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`#include "etshal.h"`
`30`	`30`	`#include "uart.h"`
`31`	`31`	`#include "esp_mphal.h"`
	`32`	`+#include "user_interface.h"`
`32`	`33`
`33`	`34`	`extern void ets_wdt_disable(void);`
`34`	`35`	`extern void wdt_feed(void);`
`@@ -82,8 +83,7 @@ void mp_hal_stdout_tx_strn_cooked(const char *str, uint32_t len) {`
`82`	`83`	`}`
`83`	`84`
`84`	`85`	`uint32_t HAL_GetTick(void) {`
`85`		`- // TODO`
`86`		`- return 0;`
	`86`	`+ return system_get_time() / 1000;`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`void HAL_Delay(uint32_t Delay) {`
Original file line number	Diff line number	Diff line change
`@@ -108,13 +108,13 @@ STATIC mp_obj_t pyb_elapsed_millis(mp_obj_t start) {`
`108`	`108`	`STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_elapsed_millis_obj, pyb_elapsed_millis);`
`109`	`109`
`110`	`110`	`STATIC mp_obj_t pyb_micros(void) {`
`111`		`- return MP_OBJ_NEW_SMALL_INT(0);`
	`111`	`+ return MP_OBJ_NEW_SMALL_INT(system_get_time());`
`112`	`112`	`}`
`113`	`113`	`STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_micros_obj, pyb_micros);`
`114`	`114`
`115`	`115`	`STATIC mp_obj_t pyb_elapsed_micros(mp_obj_t start) {`
`116`	`116`	`uint32_t startMicros = mp_obj_get_int(start);`
`117`		`- uint32_t currMicros = 0;`
	`117`	`+ uint32_t currMicros = system_get_time();`
`118`	`118`	`return MP_OBJ_NEW_SMALL_INT((currMicros - startMicros) & 0x3fffffff);`
`119`	`119`	`}`
`120`	`120`	`STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_elapsed_micros_obj, pyb_elapsed_micros);`