summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Shawcroft <scott.shawcroft@gmail.com>2017-04-17 16:44:48 -0700
committerScott Shawcroft <scott.shawcroft@gmail.com>2017-04-18 09:44:04 -0700
commitca176535a9f6ae16b2c77975acbc61d8256dc3cc (patch)
tree31b991ee03ce41e56ae7d0af3b58e1129c74cbb8
parent67ec52d7a97f5559a40c6dceb1a70abb9d7b88f0 (diff)
esp8266: Fix busio.SPI to take both MOSI and MISO.
-rw-r--r--esp8266/common-hal/busio/SPI.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/esp8266/common-hal/busio/SPI.c b/esp8266/common-hal/busio/SPI.c
index 9ffb0294d..910e1e40d 100644
--- a/esp8266/common-hal/busio/SPI.c
+++ b/esp8266/common-hal/busio/SPI.c
@@ -42,7 +42,8 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
const mcu_pin_obj_t * clock, const mcu_pin_obj_t * mosi,
const mcu_pin_obj_t * miso) {
if (clock != &pin_MTMS || !((mosi == &pin_MTCK && miso == MP_OBJ_TO_PTR(mp_const_none)) ||
- (mosi == MP_OBJ_TO_PTR(mp_const_none) && miso == &pin_MTDI))) {
+ (mosi == MP_OBJ_TO_PTR(mp_const_none) && miso == &pin_MTDI) ||
+ (mosi == &pin_MTCK && miso == &pin_MTDI))) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
"Pins not valid for SPI"));
}