X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Fnunchuk.py;h=0a1a24c04e84bdf040f9dbc9578c607aaf86c89c;hp=128b10e56294c44ade696de01a61440a229eae1b;hb=c0d7b38e465d0f2f704c15f439e625f18122e3a3;hpb=16ba97cf2252bc9543f70a0cf3e7d4b2ec6e7ee1

diff --git a/decoders/nunchuk.py b/decoders/nunchuk.py
index 128b10e..0a1a24c 100644
--- a/decoders/nunchuk.py
+++ b/decoders/nunchuk.py
@@ -1,7 +1,7 @@
 ##
 ## This file is part of the sigrok project.
 ##
-## Copyright (C) 2010 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2010-2012 Uwe Hermann <uwe@hermann-uwe.de>
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -30,41 +30,17 @@
 # https://www.sparkfun.com/products/9281
 #
 
-# FIXME: This is just some example input for testing purposes...
-example_packets = [
-    # START condition.
-    {'type': 'S',  'range': (10, 11), 'data': None, 'ann': ''},
-
-    # Nunchuk init: Write 0x40,0x00 to slave address 0x54.
-    {'type': 'AW', 'range': (12, 13), 'data': 0x54, 'ann': ''},
-    {'type': 'DW', 'range': (14, 15), 'data': 0x40, 'ann': ''},
-    {'type': 'AW', 'range': (16, 17), 'data': 0x54, 'ann': ''},
-    {'type': 'DW', 'range': (18, 19), 'data': 0x00, 'ann': ''},
-
-    # Get data: Read 6 bytes of data.
-    {'type': 'DR', 'range': (20, 21), 'data': 0x11, 'ann': ''},
-    {'type': 'DR', 'range': (22, 23), 'data': 0x22, 'ann': ''},
-    {'type': 'DR', 'range': (24, 25), 'data': 0x33, 'ann': ''},
-    {'type': 'DR', 'range': (26, 27), 'data': 0x44, 'ann': ''},
-    {'type': 'DR', 'range': (28, 29), 'data': 0x55, 'ann': ''},
-    {'type': 'DR', 'range': (30, 31), 'data': 0x66, 'ann': ''},
-
-    # STOP condition.
-    {'type': 'P',  'range': (32, 33), 'data': None, 'ann': ''},
-]
-
-class Sample():
-    def __init__(self, data):
-        self.data = data
-    def probe(self, probe):
-        s = ord(self.data[probe / 8]) & (1 << (probe % 8))
-        return True if s else False
-
-def sampleiter(data, unitsize):
-    for i in range(0, len(data), unitsize):
-        yield(Sample(data[i:i+unitsize]))
-
-class Decoder():
+import sigrokdecode as srd
+
+# States
+IDLE = 0
+START = 1
+NUNCHUK_SLAVE = 2
+INIT = 3
+INITIALIZED = 4
+
+class Decoder(srd.Decoder):
+    id = 'nunchuk'
     name = 'Nunchuk'
     longname = 'Nintendo Wii Nunchuk decoder'
     desc = 'Decodes the Nintendo Wii Nunchuk I2C-based protocol.'
@@ -74,112 +50,97 @@ class Decoder():
     license = 'gplv2+'
     inputs = ['i2c']
     outputs = ['nunchuck']
-    probes = {}
+    probes = [] # TODO
     options = {}
+    annotations = [
+        ['TODO', 'TODO'], 
+    ]
 
     def __init__(self, **kwargs):
-        self.probes = Decoder.probes.copy()
-
-        # TODO: Don't hardcode the number of channels.
-        self.channels = 8
-
-        self.IDLE, self.START, self.NUNCHUK_SLAVE, self.INIT, \
-        self.INITIALIZED = range(5)
-
-        self.state = self.IDLE # TODO: Can we assume a certain initial state?
-
+        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
-
         self.databytecount = 0
 
     def start(self, metadata):
-        self.unitsize = metadata['unitsize']
+        # 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, data):
-        """Nintendo Wii Nunchuk decoder"""
-
-        out = []
-        o = {}
-
-        # We should accept a list of samples and iterate...
-        # for sample in sampleiter(data['data'], self.unitsize):
-        for p in example_packets:
-
-            # TODO: Eliminate the need for ord().
-            # s = ord(sample.data)
-
-            if p['type'] == 'S': # TODO: Handle 'Sr' here, too?
-                self.state = self.START
-
-            elif p['type'] == 'Sr':
-                pass # FIXME
-
-            elif p['type'] == 'AR':
-                # TODO: Error/Warning, not supported, I think.
-                pass
-
-            elif p['type'] == 'AW':
-                # The Wii Nunchuk always has slave address 0x54.
-                # TODO: Handle this stuff more correctly.
-                if p['data'] == 0x54:
-                    pass # TODO
-                else:
-                    pass # TODO: What to do here? Ignore? Error?
-
-            elif p['type'] == 'DR' and self.state == self.INITIALIZED:
-                if self.databytecount == 0:
-                    self.sx = p['data']
-                elif self.databytecount == 1:
-                    self.sy = p['data']
-                elif self.databytecount == 2:
-                    self.ax = p['data'] << 2
-                elif self.databytecount == 3:
-                    self.ay = p['data'] << 2
-                elif self.databytecount == 4:
-                    self.az = p['data'] << 2
-                elif self.databytecount == 5:
-                    self.bz =  (p['data'] & (1 << 0)) >> 0
-                    self.bc =  (p['data'] & (1 << 1)) >> 1
-                    self.ax |= (p['data'] & (3 << 2)) >> 2
-                    self.ay |= (p['data'] & (3 << 4)) >> 4
-                    self.az |= (p['data'] & (3 << 6)) >> 6
-                    # del o
-                    o = {'type': 'D', 'range': (0, 0), 'data': []}
-                    o['data'] = [self.sx, self.sy, self.ax, self.ay, \
-                                 self.az, self.bz, self.bc]
-                    # sx = sy = ax = ay = az = bz = bc = 0
-                else:
-                    pass # TODO
-
-                if 0 <= self.databytecount <= 5:
-                    self.databytecount += 1
-
-                # TODO: If 6 bytes read -> save and reset
-
-            # TODO
-            elif p['type'] == 'DR' and self.state != self.INITIALIZED:
-                pass
-
-            elif p['type'] == 'DW':
-                if p['data'] == 0x40 and self.state == self.START:
-                    self.state = self.INIT
-                elif p['data'] == 0x00 and self.state == self.INIT:
-                    o = {'type': 'I', 'range': (0, 0), 'data': []}
-                    o['data'] = [0x40, 0x00]
-                    out.append(o)
-                    self.state = self.INITIALIZED
-                else:
-                    pass # TODO
-
-            elif p['type'] == 'P':
-                out.append(o)
-                self.state = self.INITIALIZED
-                self.databytecount = 0
-
-        sigrok.put(out)
-
-import sigrok
+    def decode(self, ss, es, data):
+
+        cmd, databyte, ack_bit = data
+
+        if cmd == 'START': # TODO: Handle 'Sr' here, too?
+            self.state = START
+
+        elif cmd == 'START_REPEAT':
+            pass # FIXME
+
+        elif cmd == 'ADDRESS_READ':
+            # TODO: Error/Warning, not supported, I think.
+            pass
+
+        elif cmd == 'ADDRESS_WRITE':
+            # The Wii Nunchuk always has slave address 0x54.
+            # TODO: Handle this stuff more correctly.
+            if databyte == 0x54:
+                pass # TODO
+            else:
+                pass # TODO: What to do here? Ignore? Error?
+
+        elif cmd == 'DATA_READ' and self.state == INITIALIZED:
+            if self.databytecount == 0:
+                self.sx = databyte
+            elif self.databytecount == 1:
+                self.sy = databyte
+            elif self.databytecount == 2:
+                self.ax = databyte << 2
+            elif self.databytecount == 3:
+                self.ay = databyte << 2
+            elif self.databytecount == 4:
+                self.az = databyte << 2
+            elif self.databytecount == 5:
+                self.bz =  (databyte & (1 << 0)) >> 0
+                self.bc =  (databyte & (1 << 1)) >> 1
+                self.ax |= (databyte & (3 << 2)) >> 2
+                self.ay |= (databyte & (3 << 4)) >> 4
+                self.az |= (databyte & (3 << 6)) >> 6
+
+                d = 'sx = 0x%02x, sy = 0x%02x, ax = 0x%02x, ay = 0x%02x, ' \
+                    'az = 0x%02x, bz = 0x%02x, bc = 0x%02x' % (self.sx, \
+                    self.sy, self.ax, self.ay, self.az, self.bz, self.bc)
+                self.put(ss, es, self.out_ann, [0, [d]])
+
+                self.sx = self.sy = self.ax = self.ay = self.az = 0
+                self.bz = self.bc = 0
+            else:
+                pass # TODO
+
+            if 0 <= self.databytecount <= 5:
+                self.databytecount += 1
+
+            # TODO: If 6 bytes read -> save and reset
+
+        # TODO
+        elif cmd == 'DATA_READ' and self.state != INITIALIZED:
+            pass
+
+        elif cmd == 'DATA_WRITE':
+            if self.state == IDLE:
+                self.state = INITIALIZED
+            return
+    
+            if databyte == 0x40 and self.state == START:
+                self.state = INIT
+            elif databyte == 0x00 and self.state == INIT:
+                self.put(ss, es, self.out_ann, [0, ['Initialize nunchuk']])
+                self.state = INITIALIZED
+            else:
+                pass # TODO
+
+        elif cmd == 'STOP':
+            self.state = INITIALIZED
+            self.databytecount = 0