parallel: unbreak and improve "word" de-multiplexing

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

diff --git a/decoders/pwm/pd.py b/decoders/pwm/pd.py
index d6411ae42fd8fea4740cd1a21b9451a161743eec..2301523c1abd06923999aff4476b3ceae9c04a62 100644 (file)
--- a/decoders/pwm/pd.py
+++ b/decoders/pwm/pd.py
@@ -49,8 +49,10 @@ class Decoder(srd.Decoder):
     )
 
     def __init__(self):
+        self.reset()
+
+    def reset(self):
         self.ss_block = self.es_block = None
-        self.num_cycles = 0
 
     def metadata(self, key, value):
         if key == srd.SRD_CONF_SAMPLERATE:
@@ -84,13 +86,10 @@ class Decoder(srd.Decoder):
         self.put(self.ss_block, self.es_block, self.out_ann, [1, [period_s]])
 
     def putb(self, data):
-        # TODO Are these ss/es specs appropriate? It's the same value,
-        # which represents a mere period counter, not sample numbers.
-        # Probably should be:
-        # self.put(self.ss_block, self.es_block, self.out_binary, data)
-        self.put(self.num_cycles, self.num_cycles, self.out_binary, data)
+        self.put(self.ss_block, self.es_block, self.out_binary, data)
 
     def decode(self):
+        num_cycles = 0
         average = 0
 
         # Wait for an "active" edge (depends on config). This starts
@@ -105,9 +104,9 @@ class Decoder(srd.Decoder):
             # Get the next two edges. Setup some variables that get
             # referenced in the calculation and in put() routines.
             start_samplenum = self.samplenum
-            pins = self.wait({0: 'e'})
+            self.wait({0: 'e'})
             end_samplenum = self.samplenum
-            pins = self.wait({0: 'e'})
+            self.wait({0: 'e'})
             self.ss_block = start_samplenum
             self.es_block = self.samplenum
 
@@ -128,7 +127,7 @@ class Decoder(srd.Decoder):
             self.putp(period_t)
 
             # Update and report the new duty cycle average.
-            self.num_cycles += 1
+            num_cycles += 1
             average += percent
             self.put(self.first_samplenum, self.es_block, self.out_average,
-                     float(average / self.num_cycles))
+                     float(average / num_cycles))