Fix board detection and also check for the chip just in case future boards are added.

[hackapet/Adafruit_Blinka.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 0088ef250adbdcef5856833ac52e026718a2603e..39269229db72879e7546cd6a268a9bf9bc66499a 100644 (file)
--- a/src/adafruit_blinka/microcontroller/nova/spi.py
+++ b/src/adafruit_blinka/microcontroller/nova/spi.py
@@ -1,15 +1,18 @@
 class SPI:
 class SPI:

+    MSB = 0

     PAYLOAD_MAX_LENGTH = 64
 
     def __init__(self, clock):
         from adafruit_blinka.microcontroller.nova import Connection
         self._nova = Connection.getInstance()
     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.setOperationMode(0, 'SPI')
         self._nova.setClockSPI(0, clock)
         self._nova.setModeSPI(0, 0)
         self._nova.setIOpinMode(0, 'DOUT')

-        self._nova.setIOpinValue(0, 'HIGH')
+        self._nova.setIOpinMode(1, 'DOUT')

         self._nova.beginSPI(0)
         self._nova.beginSPI(0)

+

         # Cpol and Cpha set by mode
         # Mode  Cpol Cpha
         #  0     0    0
         # Cpol and Cpha set by mode
         # Mode  Cpol Cpha
         #  0     0    0


@@ -18,14 +21,14 @@ class SPI:
         #  3     1    1
 
     def init(self, baudrate=100000, polarity=0, phase=0, bits=8,
         #  3     1    1
 
     def init(self, baudrate=100000, polarity=0, phase=0, bits=8,

-                  firstbit=MSB, sck=None, mosi=None, miso=None):
-        print("baudrate: " + baudrate)
-        print("mode: " + (polarity<<1) | (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
         self._nova.setClockSPI(0, baudrate)
         self._nova.setModeSPI(0, (polarity<<1) | (phase))
 
     @staticmethod

-    def getSpiReceivedData(lineOutput):
+    def get_received_data(lineOutput):

         return (lineOutput.split('RXD ')[1])
 
     @property
         return (lineOutput.split('RXD ')[1])
 
     @property


@@ -35,7 +38,6 @@ class SPI:
     def write(self, buf, start=0, end=None):
         end = end if end else len(buf)
         chunks, rest = divmod(end - start, self.PAYLOAD_MAX_LENGTH)
     def write(self, buf, start=0, end=None):
         end = end if end else len(buf)
         chunks, rest = divmod(end - start, self.PAYLOAD_MAX_LENGTH)

-        self._nova.setIOpinValue(0, 'LOW')

         for i in range(chunks):
             chunk_start = start + i * self.PAYLOAD_MAX_LENGTH
             chunk_end = chunk_start + self.PAYLOAD_MAX_LENGTH
         for i in range(chunks):
             chunk_start = start + i * self.PAYLOAD_MAX_LENGTH
             chunk_end = chunk_start + self.PAYLOAD_MAX_LENGTH


@@ -48,17 +50,13 @@ class SPI:
             self._nova.clearBuffer(0)
             self._nova.writeToBuffer(0, 0, buffer_data)
             self._nova.transferBufferSPI(0, rest)
             self._nova.clearBuffer(0)
             self._nova.writeToBuffer(0, 0, buffer_data)
             self._nova.transferBufferSPI(0, rest)

-        self._nova.setIOpinValue(0, 'HIGH')
-        print(self._nova.readBuffer(0, 4))

 
     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)

-        self._nova.setIOpinValue(0, 'LOW')

         for i in range(start, end):
         for i in range(start, end):

-            buf[start+i] = int(self.getSpiReceivedData(self._nova.transferSPI(0, write_value)), 16)
-        self._nova.setIOpinValue(0, 'HIGH')
+            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)
         readlen = in_end-in_start
         out_end = out_end if out_end else len(buffer_out)
         in_end = in_end if in_end else len(buffer_in)
         readlen = in_end-in_start


@@ -69,10 +67,8 @@ class SPI:
             tmp.extend([0] * (readlen - len(buffer_out)))
             buffer_out = tmp
         i = 0
             tmp.extend([0] * (readlen - len(buffer_out)))
             buffer_out = tmp
         i = 0

-        self._nova.setIOpinValue(0, 'LOW')

         for data_out in buffer_out:
         for data_out in buffer_out:

-            data_in = int(self.getSpiReceivedData(self._nova.transferSPI(0, data_out)), 16)
+            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
             if i < readlen:
                 buffer_in[in_start+i] = data_in
             i += 1

-        self._nova.setIOpinValue(0, 'HIGH')