X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Fpan1321.py;h=031e03dbfca831544b994ee68c36b6d80929ebbb;hp=2d86679720c5ec14047759994ef6b96c1dd5df1e;hb=5dd1c937a764a1517a8e12d10af6c3fcb9c8b3c9;hpb=d0e93c76e381eff58ca23949301f781b24ba4a8b

diff --git a/decoders/pan1321.py b/decoders/pan1321.py
index 2d86679..031e03d 100644
--- a/decoders/pan1321.py
+++ b/decoders/pan1321.py
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
+#
+# Panasonic PAN1321 Bluetooth module protocol decoder
 #
 # TODO
 #
@@ -30,10 +32,14 @@ ANN_ASCII = 0
 # UART 'data' packet type.
 T_DATA = 1
 
+# ...
+RX = 0
+TX = 1
+
 class Decoder(srd.Decoder):
     id = 'pan1321'
-    name = 'Panasonic PAN1321'
-    longname = 'TODO.'
+    name = 'PAN1321'
+    longname = 'Panasonic PAN1321'
     desc = 'TODO.'
     longdesc = 'TODO.'
     author = 'Uwe Hermann'
@@ -41,52 +47,71 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['uart']
     outputs = ['pan1321']
-    # probes = [
-    # ]
-    options = {
-    }
+    probes = []
+    options = {}
     annotations = [
-        # ANN_ASCII
-        ["ASCII", "TODO: description"],
+        ['ASCII', 'TODO: description'],
     ]
 
     def __init__(self, **kwargs):
-        self.cmd = ''
+        self.cmd = ['', '']
 
     def start(self, metadata):
-        # self.out_proto = self.add(srd.SRD_OUTPUT_PROTO, 'pan1321')
-        self.out_ann = self.add(srd.SRD_OUTPUT_ANN, 'pan1321')
+        # self.out_proto = self.add(srd.OUTPUT_PROTO, 'pan1321')
+        self.out_ann = self.add(srd.OUTPUT_ANN, 'pan1321')
 
     def report(self):
         pass
 
+    def handle_host_command(self, ss, es, rxtx, s):
+        if s.startswith('AT+JSEC'):
+            pin = s[s.find('\r\n') - 4:len(s) - 2]
+            self.put(ss, es, self.out_ann,
+                     [ANN_ASCII, ['Host set the Bluetooth PIN to ' + pin]])
+        elif s.startswith('AT+JSLN'):
+            name = s[s.find(',') + 1:-2]
+            self.put(ss, es, self.out_ann,
+                     [ANN_ASCII, ['Host set the Bluetooth name to ' + name]])
+        else:
+            self.put(ss, es, self.out_ann,
+                     [ANN_ASCII, ['Host sent unsupported command']])
+        self.cmd[rxtx] = ''
+
+    def handle_device_reply(self, ss, es, rxtx, s):
+        if s == 'ROK\r\n':
+            self.put(ss, es, self.out_ann,
+                     [ANN_ASCII, ['Device initialized correctly']])
+        elif s == 'OK\r\n':
+            self.put(ss, es, self.out_ann,
+                     [ANN_ASCII, ['Device acknowledged last command']])
+        elif s.startswith('ERR'):
+            error = s[s.find('=') + 1:]
+            self.put(ss, es, self.out_ann,
+                     [ANN_ASCII, ['Device sent error code ' + error]])
+        else:
+            self.put(ss, es, self.out_ann,
+                     [ANN_ASCII, ['Device sent an unknown reply']])
+        self.cmd[rxtx] = ''
+
     def decode(self, ss, es, data):
-        ptype, pdata = data
+        ptype, rxtx, pdata = data
 
         # For now, ignore all UART packets except the actual data packets.
         if ptype != T_DATA:
             return
 
-        # Append new (ASCII) byte to the current command.
-        self.cmd += chr(pdata)
+        # Append a new (ASCII) byte to the currently built/parsed command.
+        self.cmd[rxtx] += chr(pdata)
 
         # Get packets/bytes until an \r\n sequence is found (end of command).
-        if chr(pdata) != '\n':
+        if self.cmd[rxtx][-1:] != '\n':
             return
 
-        s = self.cmd
-
-        # FIXME: This is just a quick hack.
-        if s.startswith('AT+JSEC'):
-            pin = s[s.find('\r\n') - 4:len(s) - 2]
-            self.put(ss, es, self.out_ann,
-                     [ANN_ASCII, ['Setting Bluetooth PIN to ' + pin]])
-        elif s.startswith('AT+JSLN'):
-            name = s[s.find(',') + 1:-2]
-            self.put(ss, es, self.out_ann,
-                     [ANN_ASCII, ['Setting Bluetooth name to ' + name]])
+        # Handle host commands and device replies.
+        if rxtx == RX:
+            self.handle_device_reply(ss, es, rxtx, self.cmd[rxtx])
+        elif rxtx == TX:
+            self.handle_host_command(ss, es, rxtx, self.cmd[rxtx])
         else:
-            self.put(ss, es, self.out_ann, [ANN_ASCII, ['Unsupported command']])
-
-        self.cmd = ''
+            pass # TODO: Error.