Various PDs: Throw SamplerateError instead of Exception.

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

diff --git a/decoders/guess_bitrate/pd.py b/decoders/guess_bitrate/pd.py
index 3249b31427f1b421037719680dc39bd3e0a87b9b..1d7434beb738fadfd2f51b91ddbf95502e1e9cb3 100644 (file)
--- a/decoders/guess_bitrate/pd.py
+++ b/decoders/guess_bitrate/pd.py
@@ -20,8 +20,11 @@
 
 import sigrokdecode as srd
 
+class SamplerateError(Exception):
+    pass
+
 class Decoder(srd.Decoder):
-    api_version = 1
+    api_version = 2
     id = 'guess_bitrate'
     name = 'Guess bitrate'
     longname = 'Guess bitrate/baudrate'
@@ -29,14 +32,12 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['guess_bitrate']
-    probes = [
+    channels = (
         {'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 +48,16 @@ class Decoder(srd.Decoder):
         self.first_transition = True
         self.bitwidth = None
 
-    def start(self, metadata):
-        self.samplerate = metadata['samplerate']
-        # self.out_python = self.register(srd.OUTPUT_PYTHON)
+    def start(self):
         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 not self.samplerate:
+            raise SamplerateError('Cannot decode without samplerate.')
         for (self.samplenum, pins) in data:
 
             data = pins[0]