Merge pull request #46 from pdp7/master

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

diff --git a/src/adafruit_blinka/microcontroller/raspi_23/spi.py b/src/adafruit_blinka/microcontroller/raspi_23/spi.py
old mode 100644 (file)
new mode 100755 (executable)
index d6627c6..b905873
--- a/src/adafruit_blinka/microcontroller/raspi_23/spi.py
+++ b/src/adafruit_blinka/microcontroller/raspi_23/spi.py
@@ -19,9 +19,9 @@ class SPI:
                   firstbit=MSB, sck=None, mosi=None, miso=None):
         mode = 0
         if polarity:
                   firstbit=MSB, sck=None, mosi=None, miso=None):
         mode = 0
         if polarity:

-            mode |= CPOL
+            mode |= self.CPOL

         if phase:
         if phase:

-            mode |= CPHA
+            mode |= self.CPHA

 
         self.clock_pin = sck
         self.mosi_pin = mosi
 
         self.clock_pin = sck
         self.mosi_pin = mosi


@@ -30,17 +30,70 @@ class SPI:
         self.mode = mode
         self.bits = bits
 
         self.mode = mode
         self.bits = bits
 

-    def write(self, buf):
+    def write(self, buf, start=0, end=None):

         if not buf:
             return
         if not buf:
             return

+        if end is None:
+            end = len(buf)

         try:
         try:

+            self._spi.open(self._port, 0)
+            try:
+              self._spi.no_cs = True  # this doesn't work but try anyways
+            except AttributeError:
+              pass
+            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()
+        except FileNotFoundError as not_found:
+            print("Could not open SPI device - check if SPI is enabled in kernel!")
+            raise
+
+    def readinto(self, buf, start=0, end=None):
+        if not buf:
+            return
+        if end is None:
+            end = len(buf)
+        try:
+            self._spi.open(self._port, 0)
+            try:
+              self._spi.no_cs = True  # this doesn't work but try anyways
+            except AttributeError:
+              pass
+            self._spi.max_speed_hz = self.baudrate
+            self._spi.mode = self.mode
+            self._spi.bits_per_word = self.bits
+            data = self._spi.readbytes(end-start)
+            for i in range(end-start):  # 'readinto' the given buffer
+              buf[start+i] = data[i]
+            self._spi.close()
+        except FileNotFoundError as not_found:
+            print("Could not open SPI device - check if SPI is enabled in kernel!")
+            raise

 
 

+    def write_readinto(self, buffer_out, buffer_in, out_start=0,
+                       out_end=None, in_start=0, in_end=None):
+        if not buffer_out or not buffer_in:
+            return
+        if out_end is None:
+            out_end = len(buffer_out)        
+        if in_end is None:
+            in_end = len(buffer_in)
+        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._spi.open(self._port, 0)

-            self._spi.no_cs = True
+            try:
+                self._spi.no_cs = True  # this doesn't work but try anyways
+            except AttributeError:
+                pass

             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

-            self._spi.writebytes([x for x in buf])
+            data = self._spi.xfer(list(buffer_out[out_start:out_end+1]))
+            for i in range((in_end - in_start)):
+                buffer_in[i+in_start] = data[i]

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