srd: Quick hack to make nunchuk.py work again.

diff --git a/decoders/nunchuk.py b/decoders/nunchuk.py
index 635a7143a4159b33542b3013c94ef83630e066a6..fbc03d4893081d3402b5eda4629183cc2124d102 100644 (file)
--- a/decoders/nunchuk.py
+++ b/decoders/nunchuk.py
@@ -66,7 +66,7 @@ class Sample():
     def __init__(self, data):
         self.data = data
     def probe(self, probe):
     def __init__(self, data):
         self.data = data
     def probe(self, probe):

-        s = ord(self.data[probe / 8]) & (1 << (probe % 8))
+        s = ord(self.data[int(probe / 8)]) & (1 << (probe % 8))

         return True if s else False
 
 def sampleiter(data, unitsize):
         return True if s else False
 
 def sampleiter(data, unitsize):


@@ -89,6 +89,8 @@ class Decoder(sigrok.Decoder):
 
     def __init__(self, **kwargs):
         self.probes = Decoder.probes.copy()
 
     def __init__(self, **kwargs):
         self.probes = Decoder.probes.copy()

+        self.output_protocol = None
+        self.output_annotation = None

 
         # TODO: Don't hardcode the number of channels.
         self.channels = 8
 
         # TODO: Don't hardcode the number of channels.
         self.channels = 8


@@ -101,11 +103,13 @@ class Decoder(sigrok.Decoder):
 
     def start(self, metadata):
         self.unitsize = metadata['unitsize']
 
     def start(self, metadata):
         self.unitsize = metadata['unitsize']

+        # self.output_protocol = self.output_new(2)
+        self.output_annotation = self.output_new(1)

 
     def report(self):
         pass
 
 
     def report(self):
         pass
 

-    def decode(self, data):
+    def decode(self, timeoffset, duration, data):

         """Nintendo Wii Nunchuk decoder"""
 
         out = []
         """Nintendo Wii Nunchuk decoder"""
 
         out = []


@@ -186,5 +190,7 @@ class Decoder(sigrok.Decoder):
                 self.state = INITIALIZED
                 self.databytecount = 0
 
                 self.state = INITIALIZED
                 self.databytecount = 0
 

-        self.put(out)
+        if out != []:
+            # self.put(self.output_protocol, 0, 0, out_proto)
+            self.put(self.output_annotation, 0, 0, out)