esp8266: Switch to standard mp_hal_ticks_ms() MPHAL function.

pfalcon · pfalcon · commit 6a09e7d7aea2 · 2015-10-29T19:40:05.000+03:00
diff --git a/esp8266/esp_mphal.c b/esp8266/esp_mphal.c
@@ -82,7 +82,7 @@ void mp_hal_stdout_tx_strn_cooked(const char *str, uint32_t len) {
     }
 }
 
-uint32_t HAL_GetTick(void) {
+uint32_t mp_hal_ticks_ms(void) {
     return system_get_time() / 1000;
 }
 
diff --git a/esp8266/esp_mphal.h b/esp8266/esp_mphal.h
@@ -37,7 +37,7 @@ void mp_hal_stdout_tx_str(const char *str);
 void mp_hal_stdout_tx_strn(const char *str, uint32_t len);
 void mp_hal_stdout_tx_strn_cooked(const char *str, uint32_t len);
 
-uint32_t HAL_GetTick(void);
+uint32_t mp_hal_ticks_ms(void);
 void mp_hal_delay_ms(uint32_t delay);
 void mp_hal_delay_us(uint32_t);
 void mp_hal_set_interrupt_char(int c);
diff --git a/esp8266/modpyb.c b/esp8266/modpyb.c
@@ -102,13 +102,13 @@ STATIC mp_obj_t pyb_sync(void) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_sync_obj, pyb_sync);
 
 STATIC mp_obj_t pyb_millis(void) {
-    return MP_OBJ_NEW_SMALL_INT(HAL_GetTick());
+    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 = HAL_GetTick();
+    uint32_t currMillis = mp_hal_ticks_ms();
     return MP_OBJ_NEW_SMALL_INT((currMillis - startMillis) & 0x3fffffff);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_elapsed_millis_obj, pyb_elapsed_millis);

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ void mp_hal_stdout_tx_strn_cooked(const char *str, uint32_t len) {`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`
`85`		`-uint32_t HAL_GetTick(void) {`
	`85`	`+uint32_t mp_hal_ticks_ms(void) {`
`86`	`86`	`return system_get_time() / 1000;`
`87`	`87`	`}`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -102,13 +102,13 @@ STATIC mp_obj_t pyb_sync(void) {`
`102`	`102`	`STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_sync_obj, pyb_sync);`
`103`	`103`
`104`	`104`	`STATIC mp_obj_t pyb_millis(void) {`
`105`		`- return MP_OBJ_NEW_SMALL_INT(HAL_GetTick());`
	`105`	`+ return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_ms());`
`106`	`106`	`}`
`107`	`107`	`STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_millis_obj, pyb_millis);`
`108`	`108`
`109`	`109`	`STATIC mp_obj_t pyb_elapsed_millis(mp_obj_t start) {`
`110`	`110`	`uint32_t startMillis = mp_obj_get_int(start);`
`111`		`- uint32_t currMillis = HAL_GetTick();`
	`111`	`+ uint32_t currMillis = mp_hal_ticks_ms();`
`112`	`112`	`return MP_OBJ_NEW_SMALL_INT((currMillis - startMillis) & 0x3fffffff);`
`113`	`113`	`}`
`114`	`114`	`STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_elapsed_millis_obj, pyb_elapsed_millis);`