Merge branch 'master' of https://github.com/adafruit/Adafruit_Blinka_Displayio into...

[hackapet/Adafruit_Blinka_Displayio.git] / displayio / fourwire.py

diff --git a/displayio/fourwire.py b/displayio/fourwire.py
index 5d8a433c5de7d564bedd7904cbb58626e3bd4de4..219656ca77f5ee4cef8df18f4778fc329526030e 100644 (file)
--- a/displayio/fourwire.py
+++ b/displayio/fourwire.py
@@ -68,9 +68,12 @@ class FourWire:
         first code.py run.
         """
         self._dc = digitalio.DigitalInOut(command)
         first code.py run.
         """
         self._dc = digitalio.DigitalInOut(command)

-        self._dc.switch_to_output()
+        self._dc.switch_to_output(value=False)

         self._chip_select = digitalio.DigitalInOut(chip_select)
         self._chip_select.switch_to_output(value=True)
         self._chip_select = digitalio.DigitalInOut(chip_select)
         self._chip_select.switch_to_output(value=True)

+        self._frequency = baudrate
+        self._polarity = polarity
+        self._phase = phase

 
         if reset is not None:
             self._reset = digitalio.DigitalInOut(reset)
 
         if reset is not None:
             self._reset = digitalio.DigitalInOut(reset)


@@ -78,10 +81,6 @@ class FourWire:
         else:
             self._reset = None
         self._spi = spi_bus
         else:
             self._reset = None
         self._spi = spi_bus

-        while self._spi.try_lock():
-            pass
-        self._spi.configure(baudrate=baudrate, polarity=polarity, phase=phase)
-        self._spi.unlock()

 
     def _release(self):
         self.reset()
 
     def _release(self):
         self.reset()


@@ -100,16 +99,12 @@ class FourWire:
             time.sleep(0.001)
             self._reset.value = True
             time.sleep(0.001)
             time.sleep(0.001)
             self._reset.value = True
             time.sleep(0.001)

-        else:
-            raise RuntimeError("No reset pin defined")

 
     def send(self, is_command, data, *, toggle_every_byte=False):
         """Sends the given command value followed by the full set of data. Display state,
         such as vertical scroll, set via ``send`` may or may not be reset once the code is
         done.
         """
 
     def send(self, is_command, data, *, toggle_every_byte=False):
         """Sends the given command value followed by the full set of data. Display state,
         such as vertical scroll, set via ``send`` may or may not be reset once the code is
         done.
         """

-        while self._spi.try_lock():
-            pass

         self._dc.value = not is_command
         if toggle_every_byte:
             for byte in data:
         self._dc.value = not is_command
         if toggle_every_byte:
             for byte in data:


@@ -119,4 +114,17 @@ class FourWire:
                 self._chip_select.value = False
         else:
             self._spi.write(data)
                 self._chip_select.value = False
         else:
             self._spi.write(data)

+
+    def begin_transaction(self):
+        """Begin the SPI transaction by locking, configuring, and setting Chip Select"""
+        while not self._spi.try_lock():
+            pass
+        self._spi.configure(
+            baudrate=self._frequency, polarity=self._polarity, phase=self._phase
+        )
+        self._chip_select.value = False
+
+    def end_transaction(self):
+        """End the SPI transaction by unlocking and setting Chip Select"""
+        self._chip_select.value = True

         self._spi.unlock()
         self._spi.unlock()