srd: nunchuk: Fix most annotation samplenumbers.

Also, add a self.putx() helper method, as most annotations we have right
now are exactly one I2C packet long (there will also be others later, though).

diff --git a/decoders/nunchuk/nunchuk.py b/decoders/nunchuk/nunchuk.py
index f59fced0e70a26ad4c15c2e0ac56b70ebe0eeea4..b274f4ad00578ab08fc9eb616ae23b9471df4869 100644 (file)
--- a/decoders/nunchuk/nunchuk.py
+++ b/decoders/nunchuk/nunchuk.py
@@ -52,35 +52,34 @@ class Decoder(srd.Decoder):
     def report(self):
         pass
 
+    def putx(self, data):
+        # Helper for annotations which span exactly one I2C packet.
+        self.put(self.ss, self.es, self.out_ann, data)
+
     def handle_reg_0x00(self, databyte):
         self.sx = databyte
-        self.put(0, 0, self.out_ann,
-                 [0, ['Analog stick X position: 0x%02x' % self.sx]])
-        self.put(0, 0, self.out_ann, [1, ['SX: 0x%02x' % self.sx]])
+        self.putx([0, ['Analog stick X position: 0x%02x' % self.sx]])
+        self.putx([1, ['SX: 0x%02x' % self.sx]])
 
     def handle_reg_0x01(self, databyte):
         self.sy = databyte
-        self.put(0, 0, self.out_ann,
-                 [0, ['Analog stick Y position: 0x%02x' % self.sy]])
-        self.put(0, 0, self.out_ann, [1, ['SY: 0x%02x' % self.sy]])
+        self.putx([0, ['Analog stick Y position: 0x%02x' % self.sy]])
+        self.putx([1, ['SY: 0x%02x' % self.sy]])
 
     def handle_reg_0x02(self, databyte):
         self.ax = databyte << 2
-        self.put(0, 0, self.out_ann,
-                 [0, ['Accelerometer X value bits[9:2]: 0x%03x' % self.ax]])
-        self.put(0, 0, self.out_ann, [1, ['AX[9:2]: 0x%03x' % self.ax]])
+        self.putx([0, ['Accelerometer X value bits[9:2]: 0x%03x' % self.ax]])
+        self.putx([1, ['AX[9:2]: 0x%03x' % self.ax]])
 
     def handle_reg_0x03(self, databyte):
         self.ay = databyte << 2
-        self.put(0, 0, self.out_ann,
-                 [0, ['Accelerometer Y value bits[9:2]: 0x%03x' % self.ay]])
-        self.put(0, 0, self.out_ann, [1, ['AY[9:2]: 0x%x' % self.ay]])
+        self.putx([0, ['Accelerometer Y value bits[9:2]: 0x%03x' % self.ay]])
+        self.putx([1, ['AY[9:2]: 0x%x' % self.ay]])
 
     def handle_reg_0x04(self, databyte):
         self.az = databyte << 2
-        self.put(0, 0, self.out_ann,
-                 [0, ['Accelerometer Z value bits[9:2]: 0x%03x' % self.az]])
-        self.put(0, 0, self.out_ann, [1, ['AZ[9:2]: 0x%x' % self.az]])
+        self.putx([0, ['Accelerometer Z value bits[9:2]: 0x%03x' % self.az]])
+        self.putx([1, ['AZ[9:2]: 0x%x' % self.az]])
 
     # TODO: Bit-exact annotations.
     def handle_reg_0x05(self, databyte):
@@ -94,24 +93,21 @@ class Decoder(srd.Decoder):
         self.az |= az_rest
 
         s = '' if (self.bz == 0) else 'not '
-        self.put(0, 0, self.out_ann, [0, ['Z button: %spressed' % s]])
-        self.put(0, 0, self.out_ann, [1, ['BZ: %d' % self.bz]])
+        self.putx([0, ['Z button: %spressed' % s]])
+        self.putx([1, ['BZ: %d' % self.bz]])
 
         s = '' if (self.bc == 0) else 'not '
-        self.put(0, 0, self.out_ann, [0, ['C button: %spressed' % s]])
-        self.put(0, 0, self.out_ann, [1, ['BC: %d' % self.bc]])
+        self.putx([0, ['C button: %spressed' % s]])
+        self.putx([1, ['BC: %d' % self.bc]])
 
-        self.put(0, 0, self.out_ann,
-                 [0, ['Accelerometer X value bits[1:0]: 0x%03x' % ax_rest]])
-        self.put(0, 0, self.out_ann, [1, ['AX[1:0]: 0x%x' % ax_rest]])
+        self.putx([0, ['Accelerometer X value bits[1:0]: 0x%x' % ax_rest]])
+        self.putx([1, ['AX[1:0]: 0x%x' % ax_rest]])
 
-        self.put(0, 0, self.out_ann,
-                 [0, ['Accelerometer Y value bits[1:0]: 0x%03x' % ay_rest]])
-        self.put(0, 0, self.out_ann, [1, ['AY[1:0]: 0x%x' % ay_rest]])
+        self.putx([0, ['Accelerometer Y value bits[1:0]: 0x%x' % ay_rest]])
+        self.putx([1, ['AY[1:0]: 0x%x' % ay_rest]])
 
-        self.put(0, 0, self.out_ann,
-                 [0, ['Accelerometer Z value bits[1:0]: 0x%03x' % az_rest]])
-        self.put(0, 0, self.out_ann, [1, ['AZ[1:0]: 0x%x' % az_rest]])
+        self.putx([0, ['Accelerometer Z value bits[1:0]: 0x%x' % az_rest]])
+        self.putx([1, ['AZ[1:0]: 0x%x' % az_rest]])
 
     def decode(self, ss, es, data):
         cmd, databyte = data
@@ -151,8 +147,7 @@ class Decoder(srd.Decoder):
 
                 self.state = 'IDLE'
             else:
-                # self.put(0, 0, self.out_ann,
-                #          [0, ['Ignoring: %s (data=%s)' % (cmd, databyte)]])
+                # self.putx([0, ['Ignoring: %s (data=%s)' % (cmd, databyte)]])
                 pass
         else:
             raise Exception('Invalid state: %s' % self.state)