libsigrokdecode: Allow multiple PD instances.

[libsigrokdecode.git] / decoders / transitioncounter.py

diff --git a/decoders/transitioncounter.py b/decoders/transitioncounter.py
index 6bd97c28a2036a7ac16adf6faee46ced54b24529..996cf2e0003d487281f7a8b267999c317a0f5e4c 100644 (file)
--- a/decoders/transitioncounter.py
+++ b/decoders/transitioncounter.py
@@ -17,85 +17,82 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+import sigrok
 
-def decode(inbuf):
-       """Counts the low->high and high->low transitions in the specified
-          channel(s) of the signal."""
+lastsample = None
+oldbit = None
+transitions = None
+rising = None
+falling = None
 
-       outbuf = ''
 
-       # FIXME: Get the data in the correct format in the first place.
-       inbuf = [ord(x) for x in inbuf]
+def decode(sampledata):
+       """Counts the low->high and high->low transitions in the specified
+          channel(s) of the signal."""
+       global lastsample
+       global oldbit, transitions, rising, falling
 
        # TODO: Don't hardcode the number of channels.
-       channels = 8
+       channels = 8    
 
-       oldbit = [0] * channels
-       transitions = [0] * channels
-       rising = [0] * channels
-       falling = [0] * channels
+       # FIXME: Get the data in the correct format in the first place.
+       inbuf = [ord(x) for x in sampledata['data']]
 
-       # Initial values.
-       oldbyte = inbuf[0]
-       for i in range(channels):
-               oldbit[i] = (oldbyte & (1 << i)) >> i
+       if lastsample == None:
+               oldbit = [0] * channels
+               transitions = [0] * channels
+               rising = [0] * channels
+               falling = [0] * channels
 
-       # Loop over all samples.
+               # Initial values.
+               lastsample = inbuf[0]
+               for i in range(channels):
+                       oldbit[i] = (lastsample & (1 << i)) >> i
+               
        # TODO: Handle LAs with more/less than 8 channels.
        for s in inbuf:
                # Optimization: Skip identical bytes (no transitions).
-               if oldbyte == s:
-                       continue
-               for i in range(channels):
-                       curbit = (s & (1 << i)) >> i
-                       # Optimization: Skip identical bits (no transitions).
-                       if oldbit[i] == curbit:
-                               continue
-                       elif (oldbit[i] == 0 and curbit == 1):
-                               rising[i] += 1
-                       elif (oldbit[i] == 1 and curbit == 0):
-                               falling[i] += 1
-                       oldbit[i] = curbit
-               oldbyte = s
-
-       # Total number of transitions is the sum of rising and falling edges.
-       for i in range(channels):
-               transitions[i] = rising[i] + falling[i]
+               if lastsample != s:
+                       for i in range(channels):
+                               curbit = (s & (1 << i)) >> i
+                               # Optimization: Skip identical bits (no transitions).
+                               if oldbit[i] == curbit:
+                                       continue
+                               elif (oldbit[i] == 0 and curbit == 1):
+                                       rising[i] += 1
+                               elif (oldbit[i] == 1 and curbit == 0):
+                                       falling[i] += 1
+                               oldbit[i] = curbit
 
-       outbuf += "Rising edges:  "
-       for i in range(channels):
-               outbuf += str(rising[i]) + " "
-       outbuf += "\nFalling edges: "
-       for i in range(channels):
-               outbuf += str(falling[i]) + " "
-       outbuf += "\nTransitions:   "
-       for i in range(channels):
-               outbuf += str(transitions[i]) + " "
-       outbuf += "\n"
+                       # Total number of transitions is the sum of rising and falling edges.
+                       for i in range(channels):
+                               transitions[i] = rising[i] + falling[i]
+               
+                       lastsample = s
+                       print(transitions)
 
-       return outbuf
+       sigrok.put(sampledata)
 
-def register():
-       return {
-               'id': 'transitioncounter',
-               'name': 'Transition counter',
-               'longname': '...',
-               'desc': 'Counts rising/falling edges in the signal.',
-               'longdesc': '...',
-               'author': 'Uwe Hermann',
-               'email': 'uwe@hermann-uwe.de',
-               'license': 'gplv2+',
-               'in': ['logic'],
-               'out': ['transitioncounts'],
-               'probes': [
-                       # All probes.
-               ],
-               'options': {
-                       # No options so far.
-               },
-               # 'start': start,
-               # 'report': report,
-       }
+register = {
+       'id': 'transitioncounter',
+       'name': 'Transition counter',
+       'longname': '...',
+       'desc': 'Counts rising/falling edges in the signal.',
+       'longdesc': '...',
+       'author': 'Uwe Hermann',
+       'email': 'uwe@hermann-uwe.de',
+       'license': 'gplv2+',
+       'in': ['logic'],
+       'out': ['transitioncounts'],
+       'probes': [
+               # All probes.
+       ],
+       'options': {
+               # No options so far.
+       },
+       # 'start': start,
+       # 'report': report,
+}
 
 # Use psyco (if available) as it results in huge performance improvements.
 try: