X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fdsi%2Fpd.py;h=b5faf6f699b0ed111e87547db9551b135a641398;hb=42233a55607c17e7b6325dc231c66f35d2edbb22;hp=d049b9c16207fb5e6c98ed9e01e21d3af4c46a37;hpb=6e333d9ef8495fd93b47ea856b0dbbdb5d33309e;p=libsigrokdecode.git

diff --git a/decoders/dsi/pd.py b/decoders/dsi/pd.py
index d049b9c..b5faf6f 100644
--- a/decoders/dsi/pd.py
+++ b/decoders/dsi/pd.py
@@ -23,14 +23,15 @@ class SamplerateError(Exception):
     pass
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'dsi'
     name = 'DSI'
     longname = 'Digital Serial Interface'
-    desc = 'DSI lighting control protocol.'
+    desc = 'Digital Serial Interface (DSI) lighting protocol.'
     license = 'gplv2+'
     inputs = ['logic']
-    outputs = ['dsi']
+    outputs = []
+    tags = ['Embedded/industrial', 'Lighting']
     channels = (
         {'id': 'dsi', 'name': 'DSI', 'desc': 'DSI data line'},
     )
@@ -46,13 +47,15 @@ class Decoder(srd.Decoder):
     )
     annotation_rows = (
         ('bits', 'Bits', (0,)),
-        ('raw', 'Raw data', (3,)),
+        ('raw-vals', 'Raw data', (3,)),
         ('fields', 'Fields', (1, 2)),
     )
 
     def __init__(self):
+        self.reset()
+
+    def reset(self):
         self.samplerate = None
-        self.samplenum = None
         self.edges, self.bits, self.ss_es_bits = [], [], []
         self.state = 'IDLE'
 
@@ -103,12 +106,13 @@ class Decoder(srd.Decoder):
         self.edges, self.bits, self.ss_es_bits = [], [], []
         self.state = 'IDLE'
 
-    def decode(self, ss, es, data):
+    def decode(self):
         if not self.samplerate:
             raise SamplerateError('Cannot decode without samplerate.')
         bit = 0
-        for (self.samplenum, pins) in data:
-            self.dsi = pins[0]
+        while True:
+            # TODO: Come up with more appropriate self.wait() conditions.
+            (self.dsi,) = self.wait()
             if self.options['polarity'] == 'active-high':
                 self.dsi ^= 1 # Invert.