X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fwiegand%2Fpd.py;h=c494789840131fb11d2b083145bc34188032596d;hb=HEAD;hp=ea873ea123a9406aac91a11689d0b2895fa2d1eb;hpb=10aeb8ea8b183394cebc0033f048f49f4262b57d;p=libsigrokdecode.git

diff --git a/decoders/wiegand/pd.py b/decoders/wiegand/pd.py
index ea873ea..7b3241f 100644
--- a/decoders/wiegand/pd.py
+++ b/decoders/wiegand/pd.py
@@ -19,6 +19,9 @@
 
 import sigrokdecode as srd
 
+class SamplerateError(Exception):
+    pass
+
 class Decoder(srd.Decoder):
     api_version = 3
     id = 'wiegand'
@@ -27,7 +30,8 @@ class Decoder(srd.Decoder):
     desc = 'Wiegand interface for electronic entry systems.'
     license = 'gplv2+'
     inputs = ['logic']
-    outputs = ['wiegand']
+    outputs = []
+    tags = ['Embedded/industrial', 'RFID']
     channels = (
         {'id': 'd0', 'name': 'D0', 'desc': 'Data 0 line'},
         {'id': 'd1', 'name': 'D1', 'desc': 'Data 1 line'},
@@ -39,18 +43,19 @@ class Decoder(srd.Decoder):
          'default': 4, 'values': (1, 2, 4, 8, 16, 32)},
     )
     annotations = (
-        ('bits', 'Bits'),
+        ('bit', 'Bit'),
         ('state', 'State'),
     )
     annotation_rows = (
-        ('bits', 'Binary value', (0,)),
-        ('state', 'Stream state', (1,)),
+        ('bits', 'Bits', (0,)),
+        ('states', 'Stream states', (1,)),
     )
 
     def __init__(self):
         self.reset()
 
     def reset(self):
+        self.samplerate = None
         self._samples_per_bit = 10
 
         self._d0_prev = None
@@ -73,9 +78,11 @@ class Decoder(srd.Decoder):
     def metadata(self, key, value):
         'Receive decoder metadata about the data stream.'
         if key == srd.SRD_CONF_SAMPLERATE:
-            ms_per_sample = 1000 * (1.0 / value)
-            ms_per_bit = float(self.options['bitwidth_ms'])
-            self._samples_per_bit = int(max(1, int(ms_per_bit / ms_per_sample)))
+            self.samplerate = value
+            if self.samplerate:
+                ms_per_sample = 1000 * (1.0 / self.samplerate)
+                ms_per_bit = float(self.options['bitwidth_ms'])
+                self._samples_per_bit = int(max(1, int(ms_per_bit / ms_per_sample)))
 
     def _update_state(self, state, bit=None):
         'Update state and bit values when they change.'
@@ -106,6 +113,8 @@ class Decoder(srd.Decoder):
             self._bits = []
 
     def decode(self):
+        if not self.samplerate:
+            raise SamplerateError('Cannot decode without samplerate.')
         while True:
             # TODO: Come up with more appropriate self.wait() conditions.
             (d0, d1) = self.wait()