srd: decoders: Rename obsolete timeoffset/duration.

[libsigrokdecode.git] / decoders / nunchuk.py

diff --git a/decoders/nunchuk.py b/decoders/nunchuk.py
index 3091577bcefd0892fa6f99c76ac0d7461eff59c6..bda374522e43bce637597b98a67dceaff659c055 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.out_proto = None
-        self.out_ann = 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,13 +85,13 @@ class Decoder(sigrokdecode.Decoder):
         self.databytecount = 0
 
     def start(self, metadata):
-        # self.out_proto = self.add(2)
-        self.out_ann = 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
 
-    def decode(self, timeoffset, duration, data):
+    def decode(self, ss, es, data):
         out = []
         o = {}