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 cc19cd89312679e6a09450980f5ab9ffa76c3901..01b885bb50c35a629d72af9474767ced2b71d9c8 100755 (executable)
--- a/src/adafruit_blinka/microcontroller/generic_linux/spi.py
+++ b/src/adafruit_blinka/microcontroller/generic_linux/spi.py
@@ -1,4 +1,4 @@
-import spidev
+import Adafruit_PureIO.spi as spi

 import time
 from adafruit_blinka.agnostic import detector
 
 import time
 from adafruit_blinka.agnostic import detector
 


@@ -13,8 +13,10 @@ class SPI:
     bits = 8
 
     def __init__(self, portid):
     bits = 8
 
     def __init__(self, portid):

-        self._port = portid
-        self._spi = spidev.SpiDev()
+        if isinstance(portid, tuple):
+            self._spi = spi.SPI(device=portid)
+        else:
+            self._spi = spi.SPI(device=(portid, 0))

 
     def init(self, baudrate=100000, polarity=0, phase=0, bits=8,
                   firstbit=MSB, sck=None, mosi=None, miso=None):
 
     def init(self, baudrate=100000, polarity=0, phase=0, bits=8,
                   firstbit=MSB, sck=None, mosi=None, miso=None):


@@ -23,26 +25,23 @@ class SPI:
             mode |= self.CPOL
         if phase:
             mode |= self.CPHA
             mode |= self.CPOL
         if phase:
             mode |= self.CPHA

-
-        self.clock_pin = sck
-        self.mosi_pin = mosi
-        self.miso_pin = miso

         self.baudrate = baudrate
         self.mode = mode
         self.bits = bits
         self.chip = detector.chip
 
         self.baudrate = baudrate
         self.mode = mode
         self.bits = bits
         self.chip = detector.chip
 

+        # Pins are not used
+        self.clock_pin = sck
+        self.mosi_pin = mosi
+        self.miso_pin = miso
+

     def set_no_cs(self):
     def set_no_cs(self):

-        # Linux SPI driver for AM33XX chip in BeagleBone and PocketBeagle
-        # does not support setting SPI_NO_CS mode bit (issue #104)
-        if not self.chip.AM33XX:
-            try:
-                self._spi.no_cs = True  # this doesn't work but try anyways
-            except AttributeError:
-                pass
-        else:
-            # TODO: remove this debug output
-            print("Adafruit_Blinka: generic_linux/spi.py: set_no_cs(): detected AM33XX, SKIP setting no_cs")
+        # No kernel seems to support this, so we're just going to pass
+        pass
+
+    @property
+    def frequency(self):
+        return self.baudrate

 
     def write(self, buf, start=0, end=None):
         if not buf:
 
     def write(self, buf, start=0, end=None):
         if not buf:


@@ -50,13 +49,13 @@ class SPI:
         if end is None:
             end = len(buf)
         try:
         if end is None:
             end = len(buf)
         try:

-            self._spi.open(self._port, 0)
+            #self._spi.open(self._port, 0)

             self.set_no_cs()
             self._spi.max_speed_hz = self.baudrate
             self._spi.mode = self.mode
             self._spi.bits_per_word = self.bits
             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.writebytes([x for x in buf[start:end]])
-            self._spi.close()
+            self._spi.writebytes(buf[start:end])
+            #self._spi.close()

         except FileNotFoundError as not_found:
             print("Could not open SPI device - check if SPI is enabled in kernel!")
             raise
         except FileNotFoundError as not_found:
             print("Could not open SPI device - check if SPI is enabled in kernel!")
             raise


@@ -67,15 +66,15 @@ class SPI:
         if end is None:
             end = len(buf)
         try:
         if end is None:
             end = len(buf)
         try:

-            self._spi.open(self._port, 0)
-            self.set_no_cs()
+            #self._spi.open(self._port, 0)
+            #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

-            data = self._spi.xfer([write_value]*(end-start))
+            data = self._spi.transfer([write_value]*(end-start))

             for i in range(end-start):  # 'readinto' the given buffer
               buf[start+i] = data[i]
             for i in range(end-start):  # 'readinto' the given buffer
               buf[start+i] = data[i]

-            self._spi.close()
+            #self._spi.close()

         except FileNotFoundError as not_found:
             print("Could not open SPI device - check if SPI is enabled in kernel!")
             raise
         except FileNotFoundError as not_found:
             print("Could not open SPI device - check if SPI is enabled in kernel!")
             raise


@@ -91,15 +90,15 @@ class SPI:
         if out_end - out_start != in_end - in_start:
             raise RuntimeError('Buffer slices must be of equal length.')
         try:
         if out_end - out_start != in_end - in_start:
             raise RuntimeError('Buffer slices must be of equal length.')
         try:

-            self._spi.open(self._port, 0)
-            self.set_no_cs()
+            #self._spi.open(self._port, 0)
+            #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

-            data = self._spi.xfer(list(buffer_out[out_start:out_end+1]))
+            data = self._spi.transfer(list(buffer_out[out_start:out_end+1]))

             for i in range((in_end - in_start)):
                 buffer_in[i+in_start] = data[i]
             for i in range((in_end - in_start)):
                 buffer_in[i+in_start] = data[i]

-            self._spi.close()
+            #self._spi.close()

         except FileNotFoundError as not_found:
             print("Could not open SPI device - check if SPI is enabled in kernel!")
             raise
         except FileNotFoundError as not_found:
             print("Could not open SPI device - check if SPI is enabled in kernel!")
             raise