pan1321: Properly check for \r\n, not just \n.

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

diff --git a/decoders/pan1321/pd.py b/decoders/pan1321/pd.py
index 50f5adfb53e22c1dcd95195273b7e1bf6e930694..96d4385f4cffa949dadb2493285c79ae91ca1658 100644 (file)
--- a/decoders/pan1321/pd.py
+++ b/decoders/pan1321/pd.py
@@ -63,7 +63,6 @@ class Decoder(srd.Decoder):
             p = s[s.find('=') + 1:]
             if p not in ('0', '1'):
                 self.putx([2, ['Warning: Invalid JPRO parameter "%s"' % p]])
-                self.cmd[rxtx] = ''
                 return
             onoff = 'off' if (p == '0') else 'on'
             x = 'Leaving' if (p == '0') else 'Entering'
@@ -72,7 +71,6 @@ class Decoder(srd.Decoder):
         elif s.startswith('AT+JRES'):
             if s != 'AT+JRES': # JRES has no params.
                 self.putx([2, ['Warning: Invalid JRES usage.']])
-                self.cmd[rxtx] = ''
                 return
             self.putx([0, ['Triggering a software reset']])
             self.putx([1, ['Reset']])
@@ -87,7 +85,6 @@ class Decoder(srd.Decoder):
         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':
@@ -103,7 +100,6 @@ class Decoder(srd.Decoder):
         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):
         ptype, rxtx, pdata = data
@@ -120,17 +116,18 @@ 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.
         # We remove trailing \r\n from the strings before handling them.
+        self.es_block = es
         if rxtx == RX:
-            self.es_block = es
             self.handle_device_reply(rxtx, self.cmd[rxtx][:-2])
         elif rxtx == TX:
-            self.es_block = es
             self.handle_host_command(rxtx, self.cmd[rxtx][:-2])
         else:
             raise Exception('Invalid rxtx value: %d' % rxtx)
 
+        self.cmd[rxtx] = ''
+