diff options
author | Joel Holdsworth <joel@airwebreathe.org.uk> | 2013-09-03 16:36:44 +0100 |
---|---|---|
committer | Uwe Hermann <uwe@hermann-uwe.de> | 2013-09-03 17:46:24 +0200 |
commit | b055603b3ff59be1497b96a1a22da262b8753d75 (patch) | |
tree | 500ac926b85232332faf77bbec1b95f19d8a5cb1 | |
parent | 84f33bc71163b4a233f51cf64912a5a8f65d7565 (diff) | |
download | libsigrokdecode-b055603b3ff59be1497b96a1a22da262b8753d75.tar.gz libsigrokdecode-b055603b3ff59be1497b96a1a22da262b8753d75.zip |
i2s: Fixed annotation sample numbers
-rw-r--r-- | decoders/i2s/pd.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/decoders/i2s/pd.py b/decoders/i2s/pd.py index 28a4850..23a90af 100644 --- a/decoders/i2s/pd.py +++ b/decoders/i2s/pd.py @@ -53,7 +53,6 @@ class Decoder(srd.Decoder): self.samplesreceived = 0 self.first_sample = None self.start_sample = None - self.samplenum = -1 self.wordlength = -1 def start(self, metadata): @@ -96,15 +95,15 @@ class Decoder(srd.Decoder): # Only submit the sample, if we received the beginning of it. if self.start_sample != None: self.samplesreceived += 1 - self.put(self.start_sample, self.samplenum, self.out_proto, + self.put(self.start_sample, samplenum, self.out_proto, ['data', self.data]) - self.put(self.start_sample, self.samplenum, self.out_ann, + self.put(self.start_sample, samplenum, self.out_ann, [ANN_HEX, ['%s: 0x%08x' % ('L' if self.oldws else 'R', self.data)]]) # Check that the data word was the correct length. if self.wordlength != -1 and self.wordlength != self.bitcount: - self.put(self.start_sample, self.samplenum, self.out_ann, + self.put(self.start_sample, samplenum, self.out_ann, [ANN_HEX, ['WARNING: Received a %d-bit word, when a ' '%d-bit word was expected' % (self.bitcount, self.wordlength)]]) @@ -114,11 +113,11 @@ class Decoder(srd.Decoder): # Reset decoder state. self.data = 0 self.bitcount = 0 - self.start_sample = self.samplenum + self.start_sample = samplenum # Save the first sample position. if self.first_sample == None: - self.first_sample = self.samplenum + self.first_sample = samplenum self.oldws = ws |