X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fgraycode%2Fpd.py;h=f3d45abcc0d0f544a28b0125c7aacd381ddac45b;hb=826981ac5a2105c7231aeb5e5e523cd37ce72edd;hp=1211c69efd88834a47cd84120cf287be5c6d4f4e;hpb=10aeb8ea8b183394cebc0033f048f49f4262b57d;p=libsigrokdecode.git diff --git a/decoders/graycode/pd.py b/decoders/graycode/pd.py index 1211c69..f3d45ab 100644 --- a/decoders/graycode/pd.py +++ b/decoders/graycode/pd.py @@ -77,10 +77,11 @@ class Decoder(srd.Decoder): id = 'graycode' name = 'Gray code' longname = 'Gray code and rotary encoder' - desc = 'Accumulate rotary encoder increments, provide timing statistics.' + desc = 'Accumulate rotary encoder increments, provide statistics.' license = 'gplv2+' inputs = ['logic'] - outputs = ['graycode'] + outputs = [] + tags = ['Encoding'] optional_channels = tuple( {'id': 'd{}'.format(i), 'name': 'D{}'.format(i), 'desc': 'Data line {}'.format(i)} for i in range(MAX_CHANNELS) @@ -93,12 +94,12 @@ class Decoder(srd.Decoder): ('phase', 'Phase'), ('increment', 'Increment'), ('count', 'Count'), - ('turns', 'Turns'), + ('turn', 'Turn'), ('interval', 'Interval'), ('average', 'Average'), ('rpm', 'Rate'), ) - annotation_rows = tuple((u, v, (i,)) for i, (u, v) in enumerate(annotations)) + annotation_rows = tuple((u + 's', v + 's', (i,)) for i, (u, v) in enumerate(annotations)) def __init__(self): self.reset() @@ -175,7 +176,7 @@ class Decoder(srd.Decoder): if self.options['edges']: self.turns.set(self.samplenum, self.count.get() // self.options['edges']) - if self.samplerate is not None: + if self.samplerate: period = (curtime - prevtime) / self.samplerate freq = abs(phasedelta_raw) / period