esp8266: Switch to standard mp_hal_delay_ms() MPHAL function.

pfalcon · pfalcon · commit ebd9f550e8e0 · 2015-10-29T13:03:59.000+03:00
diff --git a/esp8266/esp_mphal.c b/esp8266/esp_mphal.c
@@ -86,8 +86,8 @@ uint32_t HAL_GetTick(void) {
     return system_get_time() / 1000;
 }
 
-void HAL_Delay(uint32_t Delay) {
-    mp_hal_delay_us(Delay * 1000);
+void mp_hal_delay_ms(uint32_t delay) {
+    mp_hal_delay_us(delay * 1000);
 }
 
 void mp_hal_set_interrupt_char(int c) {
diff --git a/esp8266/esp_mphal.h b/esp8266/esp_mphal.h
@@ -38,7 +38,7 @@ 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);
-void HAL_Delay(uint32_t Delay);
+void mp_hal_delay_ms(uint32_t delay);
 void mp_hal_delay_us(uint32_t);
 void mp_hal_set_interrupt_char(int c);
 uint32_t mp_hal_get_cpu_freq(void);
diff --git a/esp8266/modpyb.c b/esp8266/modpyb.c
@@ -128,7 +128,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_elapsed_micros_obj, pyb_elapsed_micros);
 STATIC mp_obj_t pyb_delay(mp_obj_t ms_in) {
     mp_int_t ms = mp_obj_get_int(ms_in);
     if (ms >= 0) {
-        HAL_Delay(ms);
+        mp_hal_delay_ms(ms);
     }
     return mp_const_none;
 }
diff --git a/esp8266/modutime.c b/esp8266/modutime.c
@@ -101,7 +101,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(time_mktime_obj, time_mktime);
 /// \function sleep(seconds)
 /// Sleep for the given number of seconds.
 STATIC mp_obj_t time_sleep(mp_obj_t seconds_o) {
-    HAL_Delay(1000 * mp_obj_get_int(seconds_o));
+    mp_hal_delay_ms(1000 * mp_obj_get_int(seconds_o));
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_1(time_sleep_obj, time_sleep);

Original file line number	Diff line number	Diff line change
`@@ -86,8 +86,8 @@ uint32_t HAL_GetTick(void) {`
`86`	`86`	`return system_get_time() / 1000;`
`87`	`87`	`}`
`88`	`88`
`89`		`-void HAL_Delay(uint32_t Delay) {`
`90`		`- mp_hal_delay_us(Delay * 1000);`
	`89`	`+void mp_hal_delay_ms(uint32_t delay) {`
	`90`	`+ mp_hal_delay_us(delay * 1000);`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`void mp_hal_set_interrupt_char(int c) {`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_elapsed_micros_obj, pyb_elapsed_micros);`
`128`	`128`	`STATIC mp_obj_t pyb_delay(mp_obj_t ms_in) {`
`129`	`129`	`mp_int_t ms = mp_obj_get_int(ms_in);`
`130`	`130`	`if (ms >= 0) {`
`131`		`- HAL_Delay(ms);`
	`131`	`+ mp_hal_delay_ms(ms);`
`132`	`132`	`}`
`133`	`133`	`return mp_const_none;`
`134`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(time_mktime_obj, time_mktime);`
`101`	`101`	`/// \function sleep(seconds)`
`102`	`102`	`/// Sleep for the given number of seconds.`
`103`	`103`	`STATIC mp_obj_t time_sleep(mp_obj_t seconds_o) {`
`104`		`- HAL_Delay(1000 * mp_obj_get_int(seconds_o));`
	`104`	`+ mp_hal_delay_ms(1000 * mp_obj_get_int(seconds_o));`
`105`	`105`	`return mp_const_none;`
`106`	`106`	`}`
`107`	`107`	`MP_DEFINE_CONST_FUN_OBJ_1(time_sleep_obj, time_sleep);`