From: Jeff Epler Date: Mon, 8 Feb 2021 18:05:43 +0000 (-0600) Subject: Merge pull request #403 from jepler/ft232-spi-write_data X-Git-Tag: 6.2.0~1 X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/8eb18ed39b1f84acda2758bec6612e862a6353c5?hp=de89c24eadd6ba05779c92c2861ac9964bed0ea3 Merge pull request #403 from jepler/ft232-spi-write_data Fix SPI.readinto with write_data=NONZERO --- diff --git a/src/adafruit_blinka/microcontroller/ft232h/spi.py b/src/adafruit_blinka/microcontroller/ft232h/spi.py index 81797b3..c768eaf 100644 --- a/src/adafruit_blinka/microcontroller/ft232h/spi.py +++ b/src/adafruit_blinka/microcontroller/ft232h/spi.py @@ -67,7 +67,8 @@ class SPI: def readinto(self, buf, start=0, end=None, write_value=0): """Read data from SPI and into the buffer""" end = end if end else len(buf) - result = self._port.read(end - start) + buffer_out = [write_value] * (end - start) + result = self._port.exchange(buffer_out, end - start, duplex=True) for i, b in enumerate(result): buf[start + i] = b diff --git a/src/adafruit_blinka/microcontroller/nxp_lpc4330/spi.py b/src/adafruit_blinka/microcontroller/nxp_lpc4330/spi.py index 17859a4..28b4fd2 100644 --- a/src/adafruit_blinka/microcontroller/nxp_lpc4330/spi.py +++ b/src/adafruit_blinka/microcontroller/nxp_lpc4330/spi.py @@ -93,7 +93,7 @@ class SPI: def readinto(self, buf, start=0, end=None, write_value=0): """Read data from SPI and into the buffer""" end = end if end else len(buf) - result = self._transmit([], end - start) + result = self._transmit([write_value] * (end - start), end - start) for i, b in enumerate(result): buf[start + i] = b