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 670a48e5ea2f9978b6b501dfdfa60a60220b112e..827269d9019162f9a6a946bd1415a7404bd4e8f0 100644 (file)
--- a/decoders/pan1321/pan1321.py
+++ b/decoders/pan1321/pan1321.py
@@ -39,6 +39,7 @@ class Decoder(srd.Decoder):
     optional_probes = []
     options = {}
     annotations = [
     optional_probes = []
     options = {}
     annotations = [

+        ['Text (verbose)', 'Human-readable text (verbose)'],

         ['Text', 'Human-readable text'],
     ]
 
         ['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]])
         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]])
         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]])
         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.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']])
         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]])
         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]])
         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):
         self.cmd[rxtx] = ''
 
     def decode(self, ss, es, data):