fix merge conflict in branch

[Adafruit_Blinka-hackapet.git] / src / adafruit_blinka / microcontroller / generic_linux / spi.py

diff --git a/src/adafruit_blinka/microcontroller/generic_linux/spi.py b/src/adafruit_blinka/microcontroller/generic_linux/spi.py
index 520f491cf69558eca6664ad5d546544f9a148e3c..01b885bb50c35a629d72af9474767ced2b71d9c8 100755 (executable)
--- a/src/adafruit_blinka/microcontroller/generic_linux/spi.py
+++ b/src/adafruit_blinka/microcontroller/generic_linux/spi.py
@@ -67,7 +67,7 @@ class SPI:
             end = len(buf)
         try:
             #self._spi.open(self._port, 0)
             end = len(buf)
         try:
             #self._spi.open(self._port, 0)

-            self.set_no_cs()
+            #self.set_no_cs()

             self._spi.max_speed_hz = self.baudrate
             self._spi.mode = self.mode
             self._spi.bits_per_word = self.bits
             self._spi.max_speed_hz = self.baudrate
             self._spi.mode = self.mode
             self._spi.bits_per_word = self.bits


@@ -91,7 +91,7 @@ class SPI:
             raise RuntimeError('Buffer slices must be of equal length.')
         try:
             #self._spi.open(self._port, 0)
             raise RuntimeError('Buffer slices must be of equal length.')
         try:
             #self._spi.open(self._port, 0)

-            self.set_no_cs()
+            #self.set_no_cs()

             self._spi.max_speed_hz = self.baudrate
             self._spi.mode = self.mode
             self._spi.bits_per_word = self.bits
             self._spi.max_speed_hz = self.baudrate
             self._spi.mode = self.mode
             self._spi.bits_per_word = self.bits