From 24c74fd30fb161837c5f8b01baf3c0fe2dfa4ed5 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Wed, 21 Nov 2012 22:43:02 +0100 Subject: All PDs: Name the files pd.py consistently. The Python module name is determined by the directory name (e.g. dcf77), the *.py file names in that directory don't matter and can be kept consistent. --- decoders/transitioncounter/Makefile.am | 2 +- decoders/transitioncounter/__init__.py | 2 +- decoders/transitioncounter/pd.py | 104 ++++++++++++++++++++++++ decoders/transitioncounter/transitioncounter.py | 104 ------------------------ 4 files changed, 106 insertions(+), 106 deletions(-) create mode 100644 decoders/transitioncounter/pd.py delete mode 100644 decoders/transitioncounter/transitioncounter.py (limited to 'decoders/transitioncounter') diff --git a/decoders/transitioncounter/Makefile.am b/decoders/transitioncounter/Makefile.am index 74688a3..b7ee1f2 100644 --- a/decoders/transitioncounter/Makefile.am +++ b/decoders/transitioncounter/Makefile.am @@ -20,7 +20,7 @@ pkgdatadir = $(DECODERS_DIR)/transitioncounter -dist_pkgdata_DATA = __init__.py transitioncounter.py +dist_pkgdata_DATA = __init__.py pd.py CLEANFILES = *.pyc diff --git a/decoders/transitioncounter/__init__.py b/decoders/transitioncounter/__init__.py index f2c3b80..3345da6 100644 --- a/decoders/transitioncounter/__init__.py +++ b/decoders/transitioncounter/__init__.py @@ -25,5 +25,5 @@ Details: TODO ''' -from .transitioncounter import * +from .pd import * diff --git a/decoders/transitioncounter/pd.py b/decoders/transitioncounter/pd.py new file mode 100644 index 0000000..9506cee --- /dev/null +++ b/decoders/transitioncounter/pd.py @@ -0,0 +1,104 @@ +## +## This file is part of the sigrok project. +## +## Copyright (C) 2010 Uwe Hermann +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +## + +# Transition counter protocol decoder + +import sigrokdecode as srd + +class Decoder(srd.Decoder): + api_version = 1 + id = 'transitioncounter' + name = 'Transition counter' + longname = 'Pin transition counter' + desc = 'Counts rising/falling edges in the signal.' + license = 'gplv2+' + inputs = ['logic'] + outputs = ['transitioncounts'] + probes = [] + optional_probes = [] + options = {} + annotations = [ + ['TODO', 'TODO'], + ] + + def __init__(self, **kwargs): + self.channels = -1 + self.lastsample = None + + def start(self, metadata): + # self.out_proto = self.add(srd.OUTPUT_PROTO, 'transitioncounter') + self.out_ann = self.add(srd.OUTPUT_ANN, 'transitioncounter') + + def report(self): + pass + + def decode(self, ss, es, data): + + for (samplenum, s) in data: + + # ... + if self.channels == -1: + self.channels = len(s) + self.oldbit = [0] * self.channels + self.transitions = [0] * self.channels + self.rising = [0] * self.channels + self.falling = [0] * self.channels + + # Optimization: Skip identical samples (no transitions). + if self.lastsample == s: + continue + + # Upon the first sample, store the initial values. + if self.lastsample == None: + self.lastsample = s + for i in range(self.channels): + self.oldbit[i] = self.lastsample[i] + + # Iterate over all channels/probes in this sample. + # Count rising and falling edges for each channel. + for i in range(self.channels): + curbit = s[i] + # Optimization: Skip identical bits (no transitions). + if self.oldbit[i] == curbit: + continue + elif (self.oldbit[i] == 0 and curbit == 1): + self.rising[i] += 1 + elif (self.oldbit[i] == 1 and curbit == 0): + self.falling[i] += 1 + self.oldbit[i] = curbit + + # Save the current sample as 'lastsample' for the next round. + self.lastsample = s + + # Total number of transitions = rising + falling edges. + for i in range(self.channels): + self.transitions[i] = self.rising[i] + self.falling[i] + + # TODO: Which output format? + # TODO: How to only output something after the last chunk of data? + outdata = [] + for i in range(self.channels): + outdata.append([self.transitions[i], self.rising[i], + self.falling[i]]) + + if outdata != []: + # self.put(0, 0, self.out_proto, out_proto) + self.put(0, 0, self.out_ann, [0, [str(outdata)]]) + diff --git a/decoders/transitioncounter/transitioncounter.py b/decoders/transitioncounter/transitioncounter.py deleted file mode 100644 index 9506cee..0000000 --- a/decoders/transitioncounter/transitioncounter.py +++ /dev/null @@ -1,104 +0,0 @@ -## -## This file is part of the sigrok project. -## -## Copyright (C) 2010 Uwe Hermann -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -## - -# Transition counter protocol decoder - -import sigrokdecode as srd - -class Decoder(srd.Decoder): - api_version = 1 - id = 'transitioncounter' - name = 'Transition counter' - longname = 'Pin transition counter' - desc = 'Counts rising/falling edges in the signal.' - license = 'gplv2+' - inputs = ['logic'] - outputs = ['transitioncounts'] - probes = [] - optional_probes = [] - options = {} - annotations = [ - ['TODO', 'TODO'], - ] - - def __init__(self, **kwargs): - self.channels = -1 - self.lastsample = None - - def start(self, metadata): - # self.out_proto = self.add(srd.OUTPUT_PROTO, 'transitioncounter') - self.out_ann = self.add(srd.OUTPUT_ANN, 'transitioncounter') - - def report(self): - pass - - def decode(self, ss, es, data): - - for (samplenum, s) in data: - - # ... - if self.channels == -1: - self.channels = len(s) - self.oldbit = [0] * self.channels - self.transitions = [0] * self.channels - self.rising = [0] * self.channels - self.falling = [0] * self.channels - - # Optimization: Skip identical samples (no transitions). - if self.lastsample == s: - continue - - # Upon the first sample, store the initial values. - if self.lastsample == None: - self.lastsample = s - for i in range(self.channels): - self.oldbit[i] = self.lastsample[i] - - # Iterate over all channels/probes in this sample. - # Count rising and falling edges for each channel. - for i in range(self.channels): - curbit = s[i] - # Optimization: Skip identical bits (no transitions). - if self.oldbit[i] == curbit: - continue - elif (self.oldbit[i] == 0 and curbit == 1): - self.rising[i] += 1 - elif (self.oldbit[i] == 1 and curbit == 0): - self.falling[i] += 1 - self.oldbit[i] = curbit - - # Save the current sample as 'lastsample' for the next round. - self.lastsample = s - - # Total number of transitions = rising + falling edges. - for i in range(self.channels): - self.transitions[i] = self.rising[i] + self.falling[i] - - # TODO: Which output format? - # TODO: How to only output something after the last chunk of data? - outdata = [] - for i in range(self.channels): - outdata.append([self.transitions[i], self.rising[i], - self.falling[i]]) - - if outdata != []: - # self.put(0, 0, self.out_proto, out_proto) - self.put(0, 0, self.out_ann, [0, [str(outdata)]]) - -- cgit v1.2.3-70-g09d2