Make delay() overridable "weak"

dok-net · dok-net · commit e49012baaa26 · 2019-07-16T10:47:46.000+02:00
diff --git a/cores/esp8266/core_esp8266_wiring.cpp b/cores/esp8266/core_esp8266_wiring.cpp
@@ -43,7 +43,7 @@ void delay_end(void* arg) {
     esp_schedule();
 }
 
-void delay(unsigned long ms) {
+void __delay(unsigned long ms) {
     if(ms) {
         os_timer_setfn(&delay_timer, (os_timer_func_t*) &delay_end, 0);
         os_timer_arm(&delay_timer, ms, ONCE);
@@ -56,6 +56,8 @@ void delay(unsigned long ms) {
     }
 }
 
+void delay(unsigned long ms) __attribute__ ((weak, alias("__delay"))); 
+
 void micros_overflow_tick(void* arg) {
     (void) arg;
     uint32_t m = system_get_time();

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ void delay_end(void* arg) {`
`43`	`43`	`esp_schedule();`
`44`	`44`	`}`
`45`	`45`
`46`		`-void delay(unsigned long ms) {`
	`46`	`+void __delay(unsigned long ms) {`
`47`	`47`	`if(ms) {`
`48`	`48`	`os_timer_setfn(&delay_timer, (os_timer_func_t*) &delay_end, 0);`
`49`	`49`	`os_timer_arm(&delay_timer, ms, ONCE);`
`@@ -56,6 +56,8 @@ void delay(unsigned long ms) {`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
	`59`	`+void delay(unsigned long ms) __attribute__ ((weak, alias("__delay")));`
	`60`	`+`
`59`	`61`	`void micros_overflow_tick(void* arg) {`
`60`	`62`	`(void) arg;`
`61`	`63`	`uint32_t m = system_get_time();`