X-Git-Url: https://git.ayoreis.com/hackapet/Adafruit_Blinka_Displayio.git/blobdiff_plain/e6284da03fe940ace9fe15d092f45124cb7c12d2..b6c1453b93053cbf2fb6aae6f09fdb8f9b9e4345:/displayio/_fourwire.py diff --git a/displayio/_fourwire.py b/displayio/_fourwire.py index 0aae5da..61be810 100644 --- a/displayio/_fourwire.py +++ b/displayio/_fourwire.py @@ -22,7 +22,7 @@ from typing import Optional import digitalio import busio import microcontroller -import _typing +from circuitpython_typing import ReadableBuffer from ._constants import ( CHIP_SELECT_TOGGLE_EVERY_BYTE, CHIP_SELECT_UNTOUCHED, @@ -30,7 +30,7 @@ from ._constants import ( DISPLAY_DATA, ) -__version__ = "0.0.0-auto.0" +__version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git" @@ -93,7 +93,11 @@ class FourWire: time.sleep(0.001) def send( - self, command, data: _typing.ReadableBuffer, *, toggle_every_byte: bool = False + self, + command, + data: ReadableBuffer, + *, + toggle_every_byte: bool = False, ) -> None: """ Sends the given command value followed by the full set of data. Display state, @@ -108,11 +112,16 @@ class FourWire: else CHIP_SELECT_UNTOUCHED ) self._begin_transaction() - self._send(DISPLAY_COMMAND, chip_select, command) + self._send(DISPLAY_COMMAND, chip_select, bytes([command])) self._send(DISPLAY_DATA, chip_select, data) self._end_transaction() - def _send(self, data_type: int, chip_select: int, data: _typing.ReadableBuffer): + def _send( + self, + data_type: int, + chip_select: int, + data: ReadableBuffer, + ): self._dc.value = data_type == DISPLAY_DATA if chip_select == CHIP_SELECT_TOGGLE_EVERY_BYTE: for byte in data: @@ -123,16 +132,24 @@ class FourWire: else: self._spi.write(data) - def _begin_transaction(self): + def _free(self) -> bool: + """Attempt to free the bus and return False if busy""" + if not self._spi.try_lock(): + return False + self._spi.unlock() + return True + + def _begin_transaction(self) -> bool: """Begin the SPI transaction by locking, configuring, and setting Chip Select""" - while not self._spi.try_lock(): - pass + if not self._spi.try_lock(): + return False self._spi.configure( baudrate=self._frequency, polarity=self._polarity, phase=self._phase ) self._chip_select.value = False + return True - def _end_transaction(self): + def _end_transaction(self) -> None: """End the SPI transaction by unlocking and setting Chip Select""" self._chip_select.value = True self._spi.unlock()