Merge pull request #6191 from tannewt/esp_3_wire_spi

tannewt · web-flow · commit ac7977ba7577 · 2022-03-24T14:51:16.000-07:00
Fix 3-wire SPI on ESP
diff --git a/ports/espressif/common-hal/busio/SPI.c b/ports/espressif/common-hal/busio/SPI.c
@@ -205,11 +205,10 @@ bool common_hal_busio_spi_transfer(busio_spi_obj_t *self,
     if (len == 0) {
         return true;
     }
-    // Other than the read special case, stop transfers that don't have a pin/array match
-    if (!self->MOSI && (data_out != data_in)) {
+    if (self->MOSI == NULL && data_out != NULL) {
         mp_raise_ValueError(translate("No MOSI Pin"));
     }
-    if (!self->MISO && data_in) {
+    if (self->MISO == NULL && data_in != NULL) {
         mp_raise_ValueError(translate("No MISO Pin"));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -205,11 +205,10 @@ bool common_hal_busio_spi_transfer(busio_spi_obj_t *self,`
`205`	`205`	`if (len == 0) {`
`206`	`206`	`return true;`
`207`	`207`	`}`
`208`		`- // Other than the read special case, stop transfers that don't have a pin/array match`
`209`		`- if (!self->MOSI && (data_out != data_in)) {`
	`208`	`+ if (self->MOSI == NULL && data_out != NULL) {`
`210`	`209`	`mp_raise_ValueError(translate("No MOSI Pin"));`
`211`	`210`	`}`
`212`		`- if (!self->MISO && data_in) {`
	`211`	`+ if (self->MISO == NULL && data_in != NULL) {`
`213`	`212`	`mp_raise_ValueError(translate("No MISO Pin"));`
`214`	`213`	`}`
`215`	`214`