nrf24l01: Don't decode incomplete commands.

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

diff --git a/decoders/nrf24l01/pd.py b/decoders/nrf24l01/pd.py
index 99a7d6e3f11d52de4d765870ca5e71c14f920e2e..38e5ac6b09e093d90bc6bfc52a1b6d00c7fc1a99 100644 (file)
--- a/decoders/nrf24l01/pd.py
+++ b/decoders/nrf24l01/pd.py
@@ -86,6 +86,8 @@ class Decoder(srd.Decoder):
 
     def __init__(self, **kwargs):
         self.next()
+        self.requirements_met = True
+        self.cs_was_released = False
 
     def start(self):
         self.out_ann = self.register(srd.OUTPUT_ANN)
@@ -264,9 +266,19 @@ class Decoder(srd.Decoder):
                 self.warn(pos, 'wrong data for "ACTIVATE" command')
 
     def decode(self, ss, es, data):
+        if not self.requirements_met:
+            return
+
         ptype, data1, data2 = data
 
         if ptype == 'CS-CHANGE':
+            if data1 == -1:
+                if data2 == -1:
+                    self.requirements_met = False
+                    raise ChannelError('CS# pin required.')
+                elif data2 == 1:
+                    self.cs_was_released = True
+
             if data1 == 0 and data2 == 1:
                 # Rising edge, the complete command is transmitted, process
                 # the bytes that were send after the command byte.
@@ -279,11 +291,13 @@ class Decoder(srd.Decoder):
                         self.finish_command((self.mb_s, self.mb_e))
 
                 self.next()
-        elif ptype == 'DATA':
+                self.cs_was_released = True
+        elif ptype == 'DATA' and self.cs_was_released:
             mosi, miso = data1, data2
             pos = (ss, es)
 
             if miso is None or mosi is None:
+                self.requirements_met = False
                 raise ChannelError('Both MISO and MOSI pins required.')
 
             if self.first: