pan1321: Improve commands documentation.

[libsigrokdecode.git] / decoders / pan1321 / pd.py

diff --git a/decoders/pan1321/pd.py b/decoders/pan1321/pd.py
index 3799612bb2fd230157291a177fa9b5aac187c9a9..4d56e586c5eb8f86b4f650ff5e9d5249b41a4f67 100644 (file)
--- a/decoders/pan1321/pd.py
+++ b/decoders/pan1321/pd.py
@@ -59,7 +59,17 @@ class Decoder(srd.Decoder):
         self.put(self.ss_block, self.es_block, self.out_ann, data)
 
     def handle_host_command(self, rxtx, s):
-        if s.startswith('AT+JPRO'):
+        if s.startswith('AT+JAAC'):
+            # AT+JAAC=<auto_accept> (0 or 1)
+            p = s[s.find('=') + 1:]
+            if p not in ('0', '1'):
+                self.putx([2, ['Warning: Invalid JAAC parameter "%s"' % p]])
+                return
+            x = 'Auto' if (p == '1') else 'Don\'t auto'
+            self.putx([0, ['%s-accept new connections' % x]])
+            self.putx([1, ['%s-accept connections' % x]])
+        elif s.startswith('AT+JPRO'):
+            # AT+JPRO=<mode> (0 or 1)
             p = s[s.find('=') + 1:]
             if p not in ('0', '1'):
                 self.putx([2, ['Warning: Invalid JPRO parameter "%s"' % p]])
@@ -69,16 +79,43 @@ class Decoder(srd.Decoder):
             self.putx([0, ['%s production mode' % x]])
             self.putx([1, ['Production mode = %s' % onoff]])
         elif s.startswith('AT+JRES'):
+            # AT+JRES
             if s != 'AT+JRES': # JRES has no params.
                 self.putx([2, ['Warning: Invalid JRES usage.']])
                 return
             self.putx([0, ['Triggering a software reset']])
             self.putx([1, ['Reset']])
+        elif s.startswith('AT+JSDA'):
+            # AT+JSDA=<l>,<d> (l: length in bytes, d: data)
+            # l is (max?) 3 decimal digits and ranges from 1 to MTU size.
+            # Data can be ASCII or binary values (l bytes total).
+            l, d = s[s.find('=') + 1:].split(',')
+            if not l.isnumeric():
+                self.putx([2, ['Warning: Invalid data length "%s".' % l]])
+            if int(l) != len(d):
+                self.putx([2, ['Warning: Data length mismatch (%d != %d).' % \
+                          (int(l), len(d))]])
+            # TODO: Warn if length > MTU size (which is firmware-dependent
+            # and is negotiated by both Bluetooth devices upon connection).
+            b = ''.join(['%02x ' % ord(c) for c in d])[:-1]
+            self.putx([0, ['Sending %d data bytes: %s' % (int(l), b)]])
+            self.putx([1, ['Send %d = %s' % (int(l), b)]])
         elif s.startswith('AT+JSEC'):
+            # AT+JSEC=<secmode>,<linkkey_info>,<pintype>,<pinlen>,<pin>
+            # secmode: Security mode 1 or 3 (default).
+            # linkkey_info: Must be 1 or 2. Has no function according to docs.
+            # pintype: 1: variable pin (default), 2: fixed pin.
+            # pinlen: PIN length (2 decimal digits). Max. PIN length is 16.
+            # pin: The Bluetooth PIN ('pinlen' chars). Used if pintype=2.
+            # Note: AT+JSEC (if used) must be the first command after reset.
+            # TODO: Parse all the other parameters.
             pin = s[-4:]
             self.putx([0, ['Host set the Bluetooth PIN to "' + pin + '"']])
             self.putx([1, ['PIN = ' + pin]])
         elif s.startswith('AT+JSLN'):
+            # AT+JSLN=<namelen>,<name>
+            # namelen: Friendly name length (2 decimal digits). Max. len is 18.
+            # name: The Bluetooth "friendly name" ('namelen' ASCII characters).
             name = s[s.find(',') + 1:]
             self.putx([0, ['Host set the Bluetooth name to "' + name + '"']])
             self.putx([1, ['BT name = ' + name]])
@@ -116,7 +153,7 @@ class Decoder(srd.Decoder):
         self.cmd[rxtx] += chr(pdata)
 
         # Get packets/bytes until an \r\n sequence is found (end of command).
-        if self.cmd[rxtx][-1:] != '\n':
+        if self.cmd[rxtx][-2:] != '\r\n':
             return
 
         # Handle host commands and device replies.