X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fspdif%2Fpd.py;h=e6977e26858725a55c6c1998a65a578b1099f513;hb=1049c90ff82d3d5ce32ac92b032dd2d5a5d847cd;hp=ca7e0bb9945693f0a0e5f478f3620b6bcf3be5b8;hpb=5302d1e99ed4234b622e7d85ff3e58e2e4648f25;p=libsigrokdecode.git

diff --git a/decoders/spdif/pd.py b/decoders/spdif/pd.py
index ca7e0bb..e6977e2 100644
--- a/decoders/spdif/pd.py
+++ b/decoders/spdif/pd.py
@@ -84,12 +84,12 @@ class Decoder(srd.Decoder):
         if key == srd.SRD_CONF_SAMPLERATE:
             self.samplerate = value
 
-    def get_pulse_type(self, pulse):
+    def get_pulse_type(self):
         if self.range1 == 0 or self.range2 == 0:
             return -1
-        if pulse >= self.range2:
+        if self.pulse_width >= self.range2:
             return 2
-        elif pulse >= self.range1:
+        elif self.pulse_width >= self.range1:
             return 0
         else:
             return 1
@@ -130,12 +130,12 @@ class Decoder(srd.Decoder):
         self.state = 'DECODE STREAM'
 
     def decode_stream(self):
-        pulse = self.get_pulse_type(self.pulse_width)
+        pulse = self.get_pulse_type()
 
         if not self.seen_preamble:
             # This is probably the start of a preamble, decode it.
             if pulse == 2:
-                self.preamble.append(self.get_pulse_type(self.pulse_width))
+                self.preamble.append(self.get_pulse_type())
                 self.state = 'DECODE PREAMBLE'
                 self.ss_edge = self.samplenum - self.pulse_width - 1
             return
@@ -194,13 +194,13 @@ class Decoder(srd.Decoder):
 
     def decode_preamble(self):
         if self.preamble_state == 0:
-            self.preamble.append(self.get_pulse_type(self.pulse_width))
+            self.preamble.append(self.get_pulse_type())
             self.preamble_state = 1
         elif self.preamble_state == 1:
-            self.preamble.append(self.get_pulse_type(self.pulse_width))
+            self.preamble.append(self.get_pulse_type())
             self.preamble_state = 2
         elif self.preamble_state == 2:
-            self.preamble.append(self.get_pulse_type(self.pulse_width))
+            self.preamble.append(self.get_pulse_type())
             self.preamble_state = 0
             self.state = 'DECODE STREAM'
             if self.preamble == [2, 0, 1, 0]:
@@ -210,7 +210,7 @@ class Decoder(srd.Decoder):
             elif self.preamble == [2, 1, 1, 2]:
                 self.puty([1, ['Preamble B', 'B']])
             else:
-                self.puty([1, ['Unknown Preamble', 'Unkown Prea.', 'U']])
+                self.puty([1, ['Unknown Preamble', 'Unknown Prea.', 'U']])
             self.preamble = []
             self.seen_preamble = True
             self.bitcount = 0
@@ -226,7 +226,7 @@ class Decoder(srd.Decoder):
             data = pins[0]
 
             # Initialize self.olddata with the first sample value.
-            if self.olddata == None:
+            if self.olddata is None:
                 self.olddata = data
                 continue