diff options
Diffstat (limited to 'decoders')
| -rw-r--r-- | decoders/i2c.py | 4 | ||||
| -rw-r--r-- | decoders/spi.py | 28 | ||||
| -rw-r--r-- | decoders/transitioncounter.py | 4 |
3 files changed, 18 insertions, 18 deletions
diff --git a/decoders/i2c.py b/decoders/i2c.py index 2301c3c..4b13825 100644 --- a/decoders/i2c.py +++ b/decoders/i2c.py @@ -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) diff --git a/decoders/spi.py b/decoders/spi.py index 731c77c..383206b 100644 --- a/decoders/spi.py +++ b/decoders/spi.py @@ -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: diff --git a/decoders/transitioncounter.py b/decoders/transitioncounter.py index f401b15..d9956c7 100644 --- a/decoders/transitioncounter.py +++ b/decoders/transitioncounter.py @@ -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) |