]> sigrok.org Git - libsigrokdecode.git/commitdiff
srd: Python: Consistently use single quotes for strings.
authorUwe Hermann <redacted>
Sun, 27 Nov 2011 21:17:54 +0000 (22:17 +0100)
committerUwe Hermann <redacted>
Sun, 27 Nov 2011 21:20:01 +0000 (22:20 +0100)
decoders/i2c.py
decoders/spi.py
decoders/transitioncounter.py

index 2301c3c4dfbcf19fc1436d2917da21108005d338..4b138250aaedc1af213f8161332f7094060d70ee 100644 (file)
@@ -249,7 +249,7 @@ class Decoder():
         #      'range': (self.startsample, self.samplenum - 1),
         #      'data': d, 'ann': None}
 
-        o = {'data': "0x%02x" % d}
+        o = {'data': '0x%02x' % d}
 
         # TODO: Simplify.
         if self.state == self.FIND_ADDRESS and self.wr == 1:
@@ -299,7 +299,7 @@ class Decoder():
         o = ack = d = ''
 
         # 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):
 
             # TODO: Eliminate the need for ord().
             s = ord(sample.data)
index 731c77cc3c8ae0214697cd5e0b99c4b13b5b2da6..383206b1914a6069e642f435516b594d575d9304 100644 (file)
@@ -51,16 +51,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 +70,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 +80,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,8 +93,8 @@ class Decoder():
             # Keep stats for summary
             self.bytesreceived += 1
 
-if __name__ == "__main__":
-    data = open("spi_dump.bin").read()
+if __name__ == '__main__':
+    data = open('spi_dump.bin').read()
 
     # dummy class to keep Decoder happy for test
     class Sigrok():
@@ -103,7 +103,7 @@ if __name__ == "__main__":
     sigrok = Sigrok()
 
     dec = Decoder(driver='ols', unitsize=1, starttime=0)
-    dec.decode({"time":0, "duration":len(data), "data":data, "type":"logic"})
+    dec.decode({'time':0, 'duration':len(data), 'data':data, 'type':'logic'})
 
     print dec.summary()
 else:
index f401b1520d48a8f87d1d769eefb6215c4f0c8b9b..d9956c78fb6ea4eb45e5eb559ec082eedab8352a 100644 (file)
@@ -55,7 +55,7 @@ class Decoder():
         self.falling = [0] * self.channels
 
     def start(self, metadata):
-        self.unitsize = metadata["unitsize"]
+        self.unitsize = metadata['unitsize']
 
     def report(self):
         pass
@@ -65,7 +65,7 @@ class Decoder():
            channel(s) of the signal."""
 
         # 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):
 
             # TODO: Eliminate the need for ord().
             s = ord(sample.data)