X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Fcounter%2Fpd.py;h=f1134bd14f61cb3b6bba3049608992baf249bc89;hp=798fb3a7fc8aa2b4cbc15cc1bed26949ac37c975;hb=2787cf2abc0187679e87d3735ca3e64c2a1a91c8;hpb=f113f6c9c6158de863eaf9f8f550c6dd70f87643

diff --git a/decoders/counter/pd.py b/decoders/counter/pd.py
index 798fb3a..f1134bd 100644
--- a/decoders/counter/pd.py
+++ b/decoders/counter/pd.py
@@ -27,10 +27,11 @@ class Decoder(srd.Decoder):
     id = 'counter'
     name = 'Counter'
     longname = 'Edge counter'
-    desc = 'Count number of edges.'
+    desc = 'Count the number of edges in a signal.'
     license = 'gplv2+'
     inputs = ['logic']
     outputs = []
+    tags = ['Util']
     channels = (
         {'id': 'data', 'name': 'Data', 'desc': 'Data line'},
     )
@@ -53,6 +54,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': '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):
@@ -86,20 +92,33 @@ class Decoder(srd.Decoder):
             cond_reset = len(condition)
             condition.append({PIN_RESET: opt_edge_map[reset_edge]})
 
-        edge_count = 0
+        edge_count = int(self.options['edge_off'])
         edge_start = None
-        word_count = 0
+        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
@@ -119,7 +138,8 @@ class Decoder(srd.Decoder):
             self.putc(ROW_EDGE, edge_start, ["{:d}".format(edge_count)])
             edge_start = now
 
-            if divider and (edge_count % divider) == 0:
+            word_edge_count = edge_count - int(self.options['edge_off'])
+            if divider and (word_edge_count % divider) == 0:
                 word_count += 1
                 self.putc(ROW_WORD, word_start, ["{:d}".format(word_count)])
                 word_start = now