Merge pull request #3453 from DavePutz/issue3367

tannewt · web-flow · commit ffeaef5d82a8 · 2020-09-28T14:18:51.000-07:00
Issue #3367 Changed delay calls to avoid conflicts with qspi_disable
diff --git a/shared-module/displayio/FourWire.c b/shared-module/displayio/FourWire.c
@@ -87,9 +87,9 @@ bool common_hal_displayio_fourwire_reset(mp_obj_t obj) {
         return false;
     }
     common_hal_digitalio_digitalinout_set_value(&self->reset, false);
-    common_hal_time_delay_ms(1);
+    common_hal_mcu_delay_us(1000);
     common_hal_digitalio_digitalinout_set_value(&self->reset, true);
-    common_hal_time_delay_ms(1);
+    common_hal_mcu_delay_us(1000);
     return true;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -87,9 +87,9 @@ bool common_hal_displayio_fourwire_reset(mp_obj_t obj) {`
`87`	`87`	`return false;`
`88`	`88`	`}`
`89`	`89`	`common_hal_digitalio_digitalinout_set_value(&self->reset, false);`
`90`		`- common_hal_time_delay_ms(1);`
	`90`	`+ common_hal_mcu_delay_us(1000);`
`91`	`91`	`common_hal_digitalio_digitalinout_set_value(&self->reset, true);`
`92`		`- common_hal_time_delay_ms(1);`
	`92`	`+ common_hal_mcu_delay_us(1000);`
`93`	`93`	`return true;`
`94`	`94`	`}`
`95`	`95`