X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fguess_bitrate%2Fpd.py;h=6dc9a974951ac3c3067ecf7e5ed41f3816402b79;hb=f0349f7f5bae7cff479772fa9791d3f7f311dfc3;hp=d2d7c39faec29385a6c04f9a24de680e71e57268;hpb=6a15597a7b3f901b566b7bfc8c484a14e0fb6a11;p=libsigrokdecode.git

diff --git a/decoders/guess_bitrate/pd.py b/decoders/guess_bitrate/pd.py
index d2d7c39..6dc9a97 100644
--- a/decoders/guess_bitrate/pd.py
+++ b/decoders/guess_bitrate/pd.py
@@ -1,7 +1,7 @@
 ##
 ## This file is part of the libsigrokdecode project.
 ##
-## Copyright (C) 2013 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2013-2016 Uwe Hermann <uwe@hermann-uwe.de>
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -20,8 +20,11 @@
 
 import sigrokdecode as srd
 
+class SamplerateError(Exception):
+    pass
+
 class Decoder(srd.Decoder):
-    api_version = 1
+    api_version = 3
     id = 'guess_bitrate'
     name = 'Guess bitrate'
     longname = 'Guess bitrate/baudrate'
@@ -39,48 +42,37 @@ class Decoder(srd.Decoder):
     def putx(self, data):
         self.put(self.ss_edge, self.samplenum, self.out_ann, data)
 
-    def __init__(self, **kwargs):
-        self.olddata = None
+    def __init__(self):
         self.ss_edge = None
         self.first_transition = True
         self.bitwidth = None
 
     def start(self):
-        # self.out_python = self.register(srd.OUTPUT_PYTHON)
         self.out_ann = self.register(srd.OUTPUT_ANN)
 
+        self.initial_pins = [1] # TODO: Not generally correct.
+
     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:
+            self.samplerate = value
 
-            data = pins[0]
+    def decode(self):
+        if not self.samplerate:
+            raise SamplerateError('Cannot decode without samplerate.')
 
-            # Wait for any transition on the data line.
-            if data == self.olddata:
-                continue
-
-            # Initialize first self.olddata with the first sample value.
-            if self.olddata == None:
-                self.olddata = data
-                continue
+        while True:
+            # Wait for any transition/edge on the data line.
+            self.wait({0: 'e'})
 
             # Get the smallest distance between two transitions
             # and use that to calculate the bitrate/baudrate.
-            if self.first_transition == True:
+            if self.first_transition:
                 self.ss_edge = self.samplenum
                 self.first_transition = False
             else:
                 b = self.samplenum - self.ss_edge
-                if self.bitwidth == None or b < self.bitwidth:
+                if self.bitwidth is None or b < self.bitwidth:
                     self.bitwidth = b
                     bitrate = int(float(self.samplerate) / float(b))
                     self.putx([0, ['%d' % bitrate]])
                 self.ss_edge = self.samplenum
-
-            self.olddata = data
-