From 066d659423912025b5b680c5bf74fca11aa72398 Mon Sep 17 00:00:00 2001
From: Uwe Hermann <uwe@hermann-uwe.de>
Date: Sat, 1 Feb 2014 15:41:36 +0100
Subject: usb_signalling: Define annotation rows.
---
decoders/usb_signalling/pd.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/decoders/usb_signalling/pd.py b/decoders/usb_signalling/pd.py
index 35ffce6..543089e 100644
--- a/decoders/usb_signalling/pd.py
+++ b/decoders/usb_signalling/pd.py
@@ -90,6 +90,10 @@ class Decoder(srd.Decoder):
['bit', 'Bit'],
['stuffbit', 'Stuff bit'],
]
+ annotation_rows = (
+ ('bits', 'Bits', (1, 2, 3, 4)),
+ ('symbols', 'Symbols', (0,)),
+ )
def __init__(self):
self.samplerate = None
@@ -159,12 +163,14 @@ class Decoder(srd.Decoder):
if self.consecutive_ones == 6 and b == '0':
# Stuff bit.
self.putpb(['STUFF BIT', None])
- self.putb([4, ['SB: %s/%s' % (sym, b)]])
+ self.putb([4, ['SB: %s' % b]])
+ self.putb([0, ['%s' % sym]])
self.consecutive_ones = 0
else:
# Normal bit (not a stuff bit).
self.putpb(['BIT', b])
- self.putb([3, ['%s/%s' % (sym, b)]])
+ self.putb([3, ['%s' % b]])
+ self.putb([0, ['%s' % sym]])
if b == '1':
self.consecutive_ones += 1
else:
--
cgit v1.2.3-70-g09d2