From: Uwe Hermann Date: Wed, 13 Jun 2012 17:34:11 +0000 (+0200) Subject: srd: pan1321: Add 'Text' (short) annotation format. X-Git-Tag: libsigrokdecode-0.1.1~82 X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commitdiff_plain;h=e1f5df5bd1d4847f1ebfade8d71161f8a5ede862 srd: pan1321: Add 'Text' (short) annotation format. Rename the old 'Text' format to 'Text (verbose)'. --- diff --git a/decoders/pan1321/pan1321.py b/decoders/pan1321/pan1321.py index 670a48e..827269d 100644 --- a/decoders/pan1321/pan1321.py +++ b/decoders/pan1321/pan1321.py @@ -39,6 +39,7 @@ class Decoder(srd.Decoder): optional_probes = [] options = {} annotations = [ + ['Text (verbose)', 'Human-readable text (verbose)'], ['Text', 'Human-readable text'], ] @@ -60,23 +61,30 @@ class Decoder(srd.Decoder): if s.startswith('AT+JSEC'): pin = s[-4:] self.putx([0, ['Host set the Bluetooth PIN to ' + pin]]) + self.putx([1, ['PIN = ' + pin]]) elif s.startswith('AT+JSLN'): name = s[s.find(',') + 1:] self.putx([0, ['Host set the Bluetooth name to ' + name]]) + self.putx([1, ['BT name = ' + name]]) else: self.putx([0, ['Host sent unsupported command: %s' % s]]) + self.putx([1, ['Unsupported command: %s' % s]]) self.cmd[rxtx] = '' def handle_device_reply(self, rxtx, s): if s == 'ROK': self.putx([0, ['Device initialized correctly']]) + self.putx([1, ['Init']]) elif s == 'OK': self.putx([0, ['Device acknowledged last command']]) + self.putx([1, ['ACK']]) elif s.startswith('ERR'): error = s[s.find('=') + 1:] self.putx([0, ['Device sent error code ' + error]]) + self.putx([1, ['ERR = ' + error]]) else: self.putx([0, ['Device sent an unknown reply: %s' % s]]) + self.putx([1, ['Unknown reply: %s' % s]]) self.cmd[rxtx] = '' def decode(self, ss, es, data):