X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fspi.py;h=d9891b38cd36bb4bc8921e8504e20fb13158f7d9;hb=67e847fd2185aa5677954dceacf3c279d7a68af1;hp=731c77cc3c8ae0214697cd5e0b99c4b13b5b2da6;hpb=3643fc3fe053bf531b4a7618d02c3d92c29f924b;p=libsigrokdecode.git

diff --git a/decoders/spi.py b/decoders/spi.py
index 731c77c..d9891b3 100644
--- a/decoders/spi.py
+++ b/decoders/spi.py
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
+import sigrok
+
 class Sample():
     def __init__(self, data):
         self.data = data
@@ -30,6 +32,7 @@ def sampleiter(data, unitsize):
         yield(Sample(data[i:i+unitsize]))
 
 class Decoder():
+    id = 'spi'
     name = 'SPI Decoder'
     desc = '...desc...'
     longname = '...longname...'
@@ -51,16 +54,16 @@ class Decoder():
         self.bytesreceived = 0
 
     def start(self, metadata):
-        self.unitsize = metadata["unitsize"]
+        self.unitsize = metadata['unitsize']
 
     def report(self):
-        return "SPI: %d bytes received" % self.bytesreceived
+        return 'SPI: %d bytes received' % self.bytesreceived
 
     def decode(self, data):
         # We should accept a list of samples and iterate...
-        for sample in sampleiter(data["data"], self.unitsize):
+        for sample in sampleiter(data['data'], self.unitsize):
 
-            sck = sample.probe(self.probes["sck"])
+            sck = sample.probe(self.probes['sck'])
             # Sample SDATA on rising SCK
             if sck == self.oldsck:
                 continue
@@ -70,9 +73,9 @@ class Decoder():
 
             # If this is first bit, save timestamp
             if self.rxcount == 0:
-                self.time = data["time"]
+                self.time = data['time']
             # Receive bit into our shift register
-            sdata = sample.probe(self.probes["sdata"])
+            sdata = sample.probe(self.probes['sdata'])
             if sdata:
                 self.rxdata |= 1 << (7 - self.rxcount)
             self.rxcount += 1
@@ -80,11 +83,11 @@ class Decoder():
             if self.rxcount != 8:
                 continue
             # Received a byte, pass up to sigrok
-            outdata = {"time":self.time,
-                "duration":data["time"] + data["duration"] - self.time,
-                "data":self.rxdata,
-                "display":("%02X" % self.rxdata),
-                "type":"spi",
+            outdata = {'time':self.time,
+                'duration':data['time'] + data['duration'] - self.time,
+                'data':self.rxdata,
+                'display':('%02X' % self.rxdata),
+                'type':'spi',
             }
             sigrok.put(outdata)
             # Reset decoder state
@@ -93,22 +96,5 @@ class Decoder():
             # Keep stats for summary
             self.bytesreceived += 1
 
-if __name__ == "__main__":
-    data = open("spi_dump.bin").read()
-
-    # dummy class to keep Decoder happy for test
-    class Sigrok():
-        def put(self, data):
-            print "\t", data
-    sigrok = Sigrok()
-
-    dec = Decoder(driver='ols', unitsize=1, starttime=0)
-    dec.decode({"time":0, "duration":len(data), "data":data, "type":"logic"})
-
-    print dec.summary()
-else:
-    import sigrok
-
-#Tested with:
-#  sigrok-cli -d 0:samplerate=1000000:rle=on --time=1s -p 1,2 -a spidec
+sigrok.register(Decoder)