From 29fc362596c87eaa3dc684d1d23047772ad27354 Mon Sep 17 00:00:00 2001
From: Uwe Hermann <uwe@hermann-uwe.de>
Date: Mon, 7 Oct 2013 16:32:11 +0200
Subject: i2s: Use annotation types.
This fixes parts of bug #162.
---
decoders/i2s/pd.py | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/decoders/i2s/pd.py b/decoders/i2s/pd.py
index 23a90af..c4ac4fb 100644
--- a/decoders/i2s/pd.py
+++ b/decoders/i2s/pd.py
@@ -22,9 +22,6 @@
import sigrokdecode as srd
-# Annotation formats
-ANN_HEX = 0
-
class Decoder(srd.Decoder):
api_version = 1
id = 'i2s'
@@ -42,7 +39,9 @@ class Decoder(srd.Decoder):
optional_probes = []
options = {}
annotations = [
- ['Hex', 'Annotations in hex format'],
+ ['left', 'Left channel'],
+ ['right', 'Right channel'],
+ ['warnings', 'Warnings'],
]
def __init__(self, **kwargs):
@@ -97,14 +96,14 @@ class Decoder(srd.Decoder):
self.samplesreceived += 1
self.put(self.start_sample, samplenum, self.out_proto,
['data', self.data])
+ idx = 0 if self.oldws else 1
self.put(self.start_sample, samplenum, self.out_ann,
- [ANN_HEX, ['%s: 0x%08x' % ('L' if self.oldws else 'R',
- self.data)]])
+ [idx, ['0x%08x', 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, samplenum, self.out_ann,
- [ANN_HEX, ['WARNING: Received a %d-bit word, when a '
+ [2, ['Received a %d-bit word, when a '
'%d-bit word was expected' % (self.bitcount,
self.wordlength)]])
--
cgit v1.2.3-70-g09d2