From e8b53818d68f724064c7fcca7ab826b5f2071293 Mon Sep 17 00:00:00 2001 From: Gerhard Sittig Date: Wed, 3 Jan 2018 19:41:37 +0100 Subject: [PATCH] counter: make 'reset' signal polarity an option Allow configuration of the 'reset' signal polarity. Reset counters on either falling (default) or rising edges. --- decoders/counter/pd.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/decoders/counter/pd.py b/decoders/counter/pd.py index a028765..cbb6a5f 100644 --- 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 @@ -78,7 +81,7 @@ class Decoder(srd.Decoder): if self.has_channel(1): self.have_reset = True - condition.append({1: 'f'}) + condition.append({1: self.options['reset_edge'][0]}) while True: self.wait(condition) -- 2.30.2