From: Uwe Hermann <redacted>
Date: Sun, 15 Jan 2012 00:22:19 +0000 (+0100)
Subject: srd: pan1321: Support replies from device.
X-Git-Tag: libsigrokdecode-0.1.0~144
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=5dd1c937a764a1517a8e12d10af6c3fcb9c8b3c9;p=libsigrokdecode.git

srd: pan1321: Support replies from device.
---

diff --git a/decoders/pan1321.py b/decoders/pan1321.py
index b9109b6..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
 #
@@ -52,7 +54,7 @@ class Decoder(srd.Decoder):
     ]
 
     def __init__(self, **kwargs):
-        self.cmd = ''
+        self.cmd = ['', '']
 
     def start(self, metadata):
         # self.out_proto = self.add(srd.OUTPUT_PROTO, 'pan1321')
@@ -61,6 +63,36 @@ class Decoder(srd.Decoder):
     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, rxtx, pdata = data
 
@@ -68,26 +100,18 @@ class Decoder(srd.Decoder):
         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.