Merge pull request #191 from binhollc/master

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

diff --git a/src/adafruit_blinka/microcontroller/nova/spi.py b/src/adafruit_blinka/microcontroller/nova/spi.py
index 7882f2333d5c97e5c1075cbf849f732c72b3bfd9..39269229db72879e7546cd6a268a9bf9bc66499a 100644 (file)
--- a/src/adafruit_blinka/microcontroller/nova/spi.py
+++ b/src/adafruit_blinka/microcontroller/nova/spi.py
@@ -1,49 +1,74 @@
-from adafruit_blinka.microcontroller.nova.pin import Pin
-

 class SPI:
     MSB = 0
 class SPI:
     MSB = 0

+    PAYLOAD_MAX_LENGTH = 64
+
+    def __init__(self, clock):
+        from adafruit_blinka.microcontroller.nova import Connection
+        self._nova = Connection.getInstance()
+        self._nova.setNumericalBase(10)
+        self._nova.setOperationMode(0, 'SPI')
+        self._nova.setClockSPI(0, clock)
+        self._nova.setModeSPI(0, 0)
+        self._nova.setIOpinMode(0, 'DOUT')
+        self._nova.setIOpinMode(1, 'DOUT')
+        self._nova.beginSPI(0)

 
 

-    def __init__(self):
-        from pyftdi.spi import SpiController
-        self._spi = SpiController(cs_count=1)
-        self._spi.configure('ftdi:///1')
-        self._port = self._spi.get_port(0)
-        self._port.set_frequency(100000)
-        self._port._cpol = 0
-        self._port._cpha = 0
-        # Change GPIO controller to SPI
-        Pin.ft232h_gpio = self._spi.get_gpio()
+        # Cpol and Cpha set by mode
+        # Mode  Cpol Cpha
+        #  0     0    0
+        #  1     0    1
+        #  2     1    0
+        #  3     1    1

 
     def init(self, baudrate=100000, polarity=0, phase=0, bits=8,
 
     def init(self, baudrate=100000, polarity=0, phase=0, bits=8,

-                  firstbit=MSB, sck=None, mosi=None, miso=None):
-        self._port.set_frequency(baudrate)
-        self._port._cpol = polarity
-        self._port._cpha = phase
+             firstbit=MSB, sck=None, mosi=None, miso=None):
+        #print("baudrate: " + str(baudrate))
+        #print("mode: " + str((polarity<<1) | (phase)))
+        self._nova.setClockSPI(0, baudrate)
+        self._nova.setModeSPI(0, (polarity<<1) | (phase))
+
+    @staticmethod
+    def get_received_data(lineOutput):
+        return (lineOutput.split('RXD ')[1])

 
     @property
     def frequency(self):
 
     @property
     def frequency(self):

-        return self._port.frequency
+        return self._nova.getClockSPI(0).split('CLK ')[1]

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

-        chunks, rest = divmod(end - start, self._spi.PAYLOAD_MAX_LENGTH)
+        chunks, rest = divmod(end - start, self.PAYLOAD_MAX_LENGTH)

         for i in range(chunks):
         for i in range(chunks):

-            chunk_start = start + i * self._spi.PAYLOAD_MAX_LENGTH
-            chunk_end = chunk_start + self._spi.PAYLOAD_MAX_LENGTH
-            self._port.write(buf[chunk_start:chunk_end])
+            chunk_start = start + i * self.PAYLOAD_MAX_LENGTH
+            chunk_end = chunk_start + self.PAYLOAD_MAX_LENGTH
+            buffer_data = buf[chunk_start:chunk_end]
+            self._nova.clearBuffer(0)
+            self._nova.writeToBuffer(0, 0, buffer_data)
+            self._nova.transferBufferSPI(0, chunk_end - chunk_start + 1)

         if rest:
         if rest:

-            self._port.write(buf[-1*rest:])
+            buffer_data = buf[-1*rest:]
+            self._nova.clearBuffer(0)
+            self._nova.writeToBuffer(0, 0, buffer_data)
+            self._nova.transferBufferSPI(0, rest)

 
     def readinto(self, buf, start=0, end=None, write_value=0):
         end = end if end else len(buf)
 
     def readinto(self, buf, start=0, end=None, write_value=0):
         end = end if end else len(buf)

-        result = self._port.read(end-start)
-        for i, b in enumerate(result):
-            buf[start+i] = b
+        for i in range(start, end):
+            buf[start+i] = int(self.get_received_data(self._nova.transferSPI(0, write_value)))

 
 

-    def write_readinto(self, buffer_out, buffer_in,  out_start=0, out_end=None, in_start=0, in_end=None):
+    def write_readinto(self, buffer_out, buffer_in, out_start=0, out_end=None, in_start=0, in_end=None):

         out_end = out_end if out_end else len(buffer_out)
         in_end = in_end if in_end else len(buffer_in)
         out_end = out_end if out_end else len(buffer_out)
         in_end = in_end if in_end else len(buffer_in)

-        result = self._port.exchange(buffer_out[out_start:out_end],
-                                     in_end-in_start, duplex=True)
-        for i, b in enumerate(result):
-            buffer_in[in_start+i] = b
+        readlen = in_end-in_start
+        writelen = out_end-out_start
+        if readlen > writelen:
+            # resize out and pad with 0's
+            tmp = bytearray(buffer_out)
+            tmp.extend([0] * (readlen - len(buffer_out)))
+            buffer_out = tmp
+        i = 0
+        for data_out in buffer_out:
+            data_in = int(self.get_received_data(self._nova.transferSPI(0, data_out)))
+            if i < readlen:
+                buffer_in[in_start+i] = data_in
+            i += 1