srd: decoders: Metadata consistency fixes/updates.

[libsigrokdecode.git] / decoders / nunchuk.py

diff --git a/decoders/nunchuk.py b/decoders/nunchuk.py
index d3ae8714d17c42e82481f70d9d871fc8aa6f30f3..8bf0228e03b5b722970cd5c207422e1cd8b063ba 100644 (file)
--- a/decoders/nunchuk.py
+++ b/decoders/nunchuk.py
@@ -30,7 +30,7 @@
 # https://www.sparkfun.com/products/9281
 #
 
-import sigrokdecode
+import sigrokdecode as srd
 
 # States
 IDLE = 0
@@ -62,7 +62,7 @@ example_packets = [
     {'type': 'P',  'range': (32, 33), 'data': None, 'ann': ''},
 ]
 
-class Decoder(sigrokdecode.Decoder):
+class Decoder(srd.Decoder):
     id = 'nunchuk'
     name = 'Nunchuk'
     longname = 'Nintendo Wii Nunchuk decoder'
@@ -75,11 +75,9 @@ class Decoder(sigrokdecode.Decoder):
     outputs = ['nunchuck']
     probes = [] # TODO
     options = {}
+    annotations = []
 
     def __init__(self, **kwargs):
-        self.output_protocol = None
-        self.output_annotation = None
-
         self.state = IDLE # TODO: Can we assume a certain initial state?
 
         self.sx = self.sy = self.ax = self.ay = self.az = self.bz = self.bc = 0
@@ -87,8 +85,8 @@ class Decoder(sigrokdecode.Decoder):
         self.databytecount = 0
 
     def start(self, metadata):
-        # self.output_protocol = self.add(2)
-        self.output_annotation = self.add(1)
+        # self.out_proto = self.add(srd.OUTPUT_PROTO, 'nunchuk')
+        self.out_ann = self.add(srd.OUTPUT_ANN, 'nunchuk')
 
     def report(self):
         pass
@@ -172,6 +170,6 @@ class Decoder(sigrokdecode.Decoder):
                 self.databytecount = 0
 
         if out != []:
-            # self.put(0, 0, self.output_protocol, out_proto)
-            self.put(0, 0, self.output_annotation, out)
+            # self.put(0, 0, self.out_proto, out_proto)
+            self.put(0, 0, self.out_ann, out)