counter: Let user decide how to handle the initial dead_cycles state

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

diff --git a/decoders/counter/pd.py b/decoders/counter/pd.py
index b8811e589bdf89e58ae8748435b536016f490be9..27a2be88dc07934f9eed9a33a90ddc121c5d7c70 100644 (file)
--- a/decoders/counter/pd.py
+++ b/decoders/counter/pd.py
@@ -53,8 +53,11 @@ class Decoder(srd.Decoder):
         {'id': 'divider', 'desc': 'Count divider (word width)', 'default': 0},
         {'id': 'reset_edge', 'desc': 'Edge which clears counters (reset)',
             'default': 'falling', 'values': ('rising', 'falling')},
-        {'id': 'edge_off', 'desc': 'Initial edge counter value', 'default': 0},
-        {'id': 'word_off', 'desc': 'Initial word counter value', 'default': 0},
+        {'id': 'edge_off', 'desc': 'Edge counter value after start/reset', 'default': 0},
+        {'id': 'word_off', 'desc': 'Word counter value after start/reset', 'default': 0},
+        {'id': 'dead_cycles', 'desc': 'Ignore this many edges after reset', 'default': 0},
+        {'id': 'start_with_reset', 'desc': 'Assume decode starts with reset',
+            'default': 'no', 'values': ('no', 'yes')},
     )
 
     def __init__(self):
@@ -92,16 +95,29 @@ class Decoder(srd.Decoder):
         edge_start = None
         word_count = int(self.options['word_off'])
         word_start = None
+
+        if self.options['start_with_reset'] == 'yes':
+            dead_count = int(self.options['dead_cycles'])
+        else:
+            dead_count = 0
+
         while True:
             self.wait(condition)
             now = self.samplenum
 
             if have_reset and self.matched[cond_reset]:
-                edge_count = 0
+                edge_count = int(self.options['edge_off'])
                 edge_start = now
-                word_count = 0
+                word_count = int(self.options['word_off'])
                 word_start = now
                 self.putc(ROW_RESET, now, ['Word reset', 'Reset', 'Rst', 'R'])
+                dead_count = int(self.options['dead_cycles'])
+                continue
+
+            if dead_count:
+                dead_count -= 1
+                edge_start = now
+                word_start = now
                 continue
 
             # Implementation note: In the absence of a RESET condition