From: Jan Volckaert <janvolck@gmail.com>
Date: Sun, 15 Oct 2023 18:08:46 +0000 (+0200)
Subject: make chip_select pin optional in SPI four wire
X-Git-Tag: 1.2.1~1^2~2
X-Git-Url: https://git.ayoreis.com/hackapet/Adafruit_Blinka_Displayio.git/commitdiff_plain/42a10f40a44f0a31c6481cce778a7489a9354ffe

make chip_select pin optional in SPI four wire

on Odroid C4 the chip_select is controller by the spi_meson_spicc driver, in case the SPI_CS0 is used as chip_select pin in the FourWire class Resource Busy exceptions are thrown.
---

diff --git a/displayio/_fourwire.py b/displayio/_fourwire.py
index 65b7654..1cf1682 100644
--- a/displayio/_fourwire.py
+++ b/displayio/_fourwire.py
@@ -158,14 +158,9 @@ class FourWire:
         self._spi.configure(
             baudrate=self._frequency, polarity=self._polarity, phase=self._phase
         )
-<<<<<<< HEAD
-        self._chip_select.value = False
-        return True
-=======
 
         if self._chip_select is not None:
             self._chip_select.value = False
->>>>>>> 87a1bde (make chip_select pin optional in SPI four wire)
 
     def _end_transaction(self) -> None:
         """End the SPI transaction by unlocking and setting Chip Select"""