srd: decoders: Metadata consistency fixes/updates.

[libsigrokdecode.git] / decoders / transitioncounter.py

diff --git a/decoders/transitioncounter.py b/decoders/transitioncounter.py
index 2847abc345cafb50af27b0f86183750ba9a97c5b..40fa3a899041420269d91e4f156c8a3dc3c1697f 100644 (file)
--- a/decoders/transitioncounter.py
+++ b/decoders/transitioncounter.py
@@ -18,9 +18,9 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-import sigrokdecode
+import sigrokdecode as srd
 
-class Decoder(sigrokdecode.Decoder):
+class Decoder(srd.Decoder):
     id = 'transitioncounter'
     name = 'Transition counter'
     longname = '...'
@@ -31,19 +31,17 @@ class Decoder(sigrokdecode.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['transitioncounts']
-    probes = [
-    ] # TODO?
+    probes = []
     options = {}
+    annotations = []
 
     def __init__(self, **kwargs):
-        self.output_protocol = None
-        self.output_annotation = None
         self.channels = -1
         self.lastsample = None
 
     def start(self, metadata):
-        # self.output_protocol = self.add(2)
-        self.output_annotation = self.add(1)
+        # self.out_proto = self.add(srd.OUTPUT_PROTO, 'transitioncounter')
+        self.out_ann = self.add(srd.OUTPUT_ANN, 'transitioncounter')
 
     def report(self):
         pass
@@ -97,6 +95,6 @@ class Decoder(sigrokdecode.Decoder):
             outdata += [[self.transitions[i], self.rising[i], self.falling[i]]]
 
         if outdata != []:
-            # self.put(0, 0, self.output_protocol, out_proto)
-            self.put(0, 0, self.output_annotation, outdata)
+            # self.put(0, 0, self.out_proto, out_proto)
+            self.put(0, 0, self.out_ann, outdata)