Probes, optional probes and annotations now take a tuple.

[libsigrokdecode.git] / decoders / guess_bitrate / pd.py

diff --git a/decoders/guess_bitrate/pd.py b/decoders/guess_bitrate/pd.py
index 3249b31427f1b421037719680dc39bd3e0a87b9b..84cf6a1b17cc18766f0b2e70d2707dde99855708 100644 (file)
--- a/decoders/guess_bitrate/pd.py
+++ b/decoders/guess_bitrate/pd.py
@@ -29,14 +29,12 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['guess_bitrate']
-    probes = [
+    probes = (
         {'id': 'data', 'name': 'Data', 'desc': 'Data line'},
-    ]
-    optional_probes = []
-    options = {}
-    annotations = [
-        ['bitrate', 'Bitrate / baudrate'],
-    ]
+    )
+    annotations = (
+        ('bitrate', 'Bitrate / baudrate'),
+    )
 
     def putx(self, data):
         self.put(self.ss_edge, self.samplenum, self.out_ann, data)
@@ -47,12 +45,17 @@ class Decoder(srd.Decoder):
         self.first_transition = True
         self.bitwidth = None
 
-    def start(self, metadata):
-        self.samplerate = metadata['samplerate']
+    def start(self):
         # self.out_python = self.register(srd.OUTPUT_PYTHON)
         self.out_ann = self.register(srd.OUTPUT_ANN)
 
+    def metadata(self, key, value):
+        if key == srd.SRD_CONF_SAMPLERATE:
+            self.samplerate = value;
+
     def decode(self, ss, es, data):
+        if self.samplerate is None:
+            raise Exception("Cannot decode without samplerate.")
         for (self.samplenum, pins) in data:
 
             data = pins[0]