From: Uwe Hermann <redacted>
Date: Wed, 2 May 2012 23:39:30 +0000 (+0200)
Subject: srd: JTAG: Also show the bitstrings in hex (for now).
X-Git-Tag: libsigrokdecode-0.1.1~127
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=8189738ed4ab7947a7b4a867bcde100cd84f44a7;p=libsigrokdecode.git

srd: JTAG: Also show the bitstrings in hex (for now).
---

diff --git a/decoders/jtag/jtag.py b/decoders/jtag/jtag.py
index 197d5a6..df16d2b 100644
--- a/decoders/jtag/jtag.py
+++ b/decoders/jtag/jtag.py
@@ -133,14 +133,16 @@ class Decoder(srd.Decoder):
 
             t = self.state[-2:] + ' TDI'
             b = ''.join(map(str, self.bits_tdi))
-            s = t + ': ' + b + ', ' + str(len(self.bits_tdi)) + ' bits'
+            h = ' (0x%x' % int('0b' + b, 2) + ')'
+            s = t + ': ' + b + h + ', ' + str(len(self.bits_tdi)) + ' bits'
             self.put(self.ss, self.es, self.out_ann, [0, [s]])
             self.put(self.ss, self.es, self.out_proto, [t, b])
             self.bits_tdi = []
 
             t = self.state[-2:] + ' TDO'
             b = ''.join(map(str, self.bits_tdo))
-            s = t + ': ' + b + ', ' + str(len(self.bits_tdo)) + ' bits'
+            h = ' (0x%x' % int('0b' + b, 2) + ')'
+            s = t + ': ' + b + h + ', ' + str(len(self.bits_tdo)) + ' bits'
             self.put(self.ss, self.es, self.out_ann, [0, [s]])
             self.put(self.ss, self.es, self.out_proto, [t, b])
             self.bits_tdo = []