From: Uwe Hermann <redacted>
Date: Mon, 14 Sep 2015 16:25:02 +0000 (+0200)
Subject: can: Emit bit value annotations.
X-Git-Tag: libsigrokdecode-0.4.0~61
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=d4a28d0fb6e1380590564be2b47ba3642130555b;p=libsigrokdecode.git

can: Emit bit value annotations.
---

diff --git a/decoders/can/pd.py b/decoders/can/pd.py
index df2cbee..7638c2f 100644
--- a/decoders/can/pd.py
+++ b/decoders/can/pd.py
@@ -57,6 +57,11 @@ class Decoder(srd.Decoder):
         ('ack-delimiter', 'ACK delimiter'),
         ('stuff-bit', 'Stuff bit'),
         ('warnings', 'Human-readable warnings'),
+        ('bits', 'Bits'),
+    )
+    annotation_rows = (
+        ('bits', 'Bits', (17,)),
+        ('fields', 'Fields', tuple(range(17))),
     )
 
     def __init__(self, **kwargs):
@@ -305,9 +310,8 @@ class Decoder(srd.Decoder):
         # Get the index of the current CAN frame bit (without stuff bits).
         bitnum = len(self.bits) - 1
 
-        # For debugging.
-        # self.putx([0, ['Bit %d (CAN bit %d): %d' % \
-        #           (self.curbit, bitnum, can_rx)]])
+        # Emit a bit value annotation.
+        self.putx([17, [str(can_rx)]])
 
         # If this is a stuff bit, remove it from self.bits and ignore it.
         if self.is_stuff_bit():