Merge pull request adafruit#336 from tannewt/2.x

dhalbert · web-flow · commit e2ce87e250b1 · 2017-10-16T18:43:28.000-04:00
esp8266: Correct SPI functionality when write_value is provided.
diff --git a/esp8266/common-hal/busio/SPI.c b/esp8266/common-hal/busio/SPI.c
@@ -174,13 +174,13 @@ bool common_hal_busio_spi_read(busio_spi_obj_t *self,
                                 write_value;
     for (size_t j = 0; j < count; ++j) {
         for (size_t k = 0; k < chunk_size; ++k) {
-            data[i] = spi_transaction(HSPI, 0, 0, 0, 0, 0, 0, 8, long_write_value);
+            data[i] = spi_transaction(HSPI, 0, 0, 0, 0, 8, long_write_value, 8, 0);
             ++i;
         }
         ets_loop_iter();
     }
     while (i < len) {
-        data[i] = spi_transaction(HSPI, 0, 0, 0, 0, 0, 0, 8, long_write_value);
+        data[i] = spi_transaction(HSPI, 0, 0, 0, 0, 8, long_write_value, 8, 0);
         ++i;
     }
     return true;

Original file line number	Diff line number	Diff line change
`@@ -174,13 +174,13 @@ bool common_hal_busio_spi_read(busio_spi_obj_t *self,`
`174`	`174`	`write_value;`
`175`	`175`	`for (size_t j = 0; j < count; ++j) {`
`176`	`176`	`for (size_t k = 0; k < chunk_size; ++k) {`
`177`		`- data[i] = spi_transaction(HSPI, 0, 0, 0, 0, 0, 0, 8, long_write_value);`
	`177`	`+ data[i] = spi_transaction(HSPI, 0, 0, 0, 0, 8, long_write_value, 8, 0);`
`178`	`178`	`++i;`
`179`	`179`	`}`
`180`	`180`	`ets_loop_iter();`
`181`	`181`	`}`
`182`	`182`	`while (i < len) {`
`183`		`- data[i] = spi_transaction(HSPI, 0, 0, 0, 0, 0, 0, 8, long_write_value);`
	`183`	`+ data[i] = spi_transaction(HSPI, 0, 0, 0, 0, 8, long_write_value, 8, 0);`
`184`	`184`	`++i;`
`185`	`185`	`}`
`186`	`186`	`return true;`