X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Fpan1321%2Fpd.py;h=d054e8975acb99dfc6568c4f342ee0bc70ba56ef;hp=a58738834db604ed17d3ed52020d46523eaf3680;hb=4539e9ca58966ce3c9cad4801b16c315e86ace01;hpb=b1f2d25f16636caa9d6a8d0715c772040b3dc68c

diff --git a/decoders/pan1321/pd.py b/decoders/pan1321/pd.py
index a587388..d054e89 100644
--- a/decoders/pan1321/pd.py
+++ b/decoders/pan1321/pd.py
@@ -14,12 +14,9 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+## along with this program; if not, see <http://www.gnu.org/licenses/>.
 ##
 
-# Panasonic PAN1321 Bluetooth module protocol decoder
-
 import sigrokdecode as srd
 
 # ...
@@ -27,7 +24,7 @@ RX = 0
 TX = 1
 
 class Decoder(srd.Decoder):
-    api_version = 1
+    api_version = 2
     id = 'pan1321'
     name = 'PAN1321'
     longname = 'Panasonic PAN1321'
@@ -35,32 +32,25 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['uart']
     outputs = ['pan1321']
-    probes = []
-    optional_probes = []
-    options = {}
-    annotations = [
-        ['Text (verbose)', 'Human-readable text (verbose)'],
-        ['Text', 'Human-readable text'],
-        ['Warnings', 'Human-readable warnings'],
-    ]
-
-    def __init__(self, **kwargs):
+    annotations = (
+        ('text-verbose', 'Human-readable text (verbose)'),
+        ('text', 'Human-readable text'),
+        ('warnings', 'Human-readable warnings'),
+    )
+
+    def __init__(self):
         self.cmd = ['', '']
         self.ss_block = None
 
-    def start(self, metadata):
-        # self.out_proto = self.add(srd.OUTPUT_PROTO, 'pan1321')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'pan1321')
-
-    def report(self):
-        pass
+    def start(self):
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def putx(self, data):
         self.put(self.ss_block, self.es_block, self.out_ann, data)
 
     def handle_host_command(self, rxtx, s):
         if s.startswith('AT+JAAC'):
-            # AT+JAAC=x (x can be 0 or 1)
+            # 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]])
@@ -69,6 +59,7 @@ class Decoder(srd.Decoder):
             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]])
@@ -78,28 +69,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)
+            # 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).
+            # 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]])
@@ -129,6 +135,9 @@ class Decoder(srd.Decoder):
         if ptype != 'DATA':
             return
 
+        # We're only interested in the byte value (not individual bits).
+        pdata = pdata[0]
+
         # If this is the start of a command/reply, remember the start sample.
         if self.cmd[rxtx] == '':
             self.ss_block = ss
@@ -147,8 +156,5 @@ class Decoder(srd.Decoder):
             self.handle_device_reply(rxtx, self.cmd[rxtx][:-2])
         elif rxtx == TX:
             self.handle_host_command(rxtx, self.cmd[rxtx][:-2])
-        else:
-            raise Exception('Invalid rxtx value: %d' % rxtx)
 
         self.cmd[rxtx] = ''
-