counter: explicit option text to .wait() edge mapping

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

diff --git a/decoders/counter/pd.py b/decoders/counter/pd.py
index a02876518ec21f29b1b536d9086059ec1dd79042..6dd8d918549dfe69a9117360f7410b262b5e9e72 100644 (file)
--- a/decoders/counter/pd.py
+++ b/decoders/counter/pd.py
@@ -45,8 +45,11 @@ class Decoder(srd.Decoder):
         ('word_resets', 'Word resets', (2,)),
     )
     options = (
-        {'id': 'edge', 'desc': 'Edges to check', 'default': 'any', 'values': ('any', 'rising', 'falling')},
+        {'id': 'data_edge', 'desc': 'Edges to count (data)', 'default': 'any',
+            'values': ('any', 'rising', 'falling')},
         {'id': 'divider', 'desc': 'Count divider (word width)', 'default': 0},
+        {'id': 'reset_edge', 'desc': 'Edge which clears counters (reset)',
+            'default': 'falling', 'values': ('rising', 'falling')},
     )
 
     def __init__(self):
@@ -63,7 +66,7 @@ class Decoder(srd.Decoder):
 
     def start(self):
         self.out_ann = self.register(srd.OUTPUT_ANN)
-        self.edge = self.options['edge']
+        self.edge = self.options['data_edge']
         self.divider = self.options['divider']
         if self.divider < 0:
             self.divider = 0
@@ -72,13 +75,13 @@ class Decoder(srd.Decoder):
         self.put(self.samplenum, self.samplenum, self.out_ann, [cls, annlist])
 
     def decode(self):
-        condition = [{'rising':  {0: 'r'},
-                      'falling': {0: 'f'},
-                      'any':     {0: 'e'},}[self.edge]]
+        opt_edge_map = {'rising': 'r', 'falling': 'f', 'any': 'e'}
+
+        condition = [{0: opt_edge_map[self.edge]}]
 
         if self.has_channel(1):
             self.have_reset = True
-            condition.append({1: 'f'})
+            condition.append({1: opt_edge_map[self.options['reset_edge']]})
 
         while True:
             self.wait(condition)