X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fnrf24l01%2Fpd.py;h=b026f598f9aeafcc62f42cd5d061688785c823be;hb=c4d5221077ef95488325dd104a806eadb5b5f13b;hp=a40f454b40f04270c6c4bf364558e7ff3fb28677;hpb=3cc4c4a96dba8390ec4eabbd62cc1d50d653640e;p=libsigrokdecode.git

diff --git a/decoders/nrf24l01/pd.py b/decoders/nrf24l01/pd.py
index a40f454..b026f59 100644
--- a/decoders/nrf24l01/pd.py
+++ b/decoders/nrf24l01/pd.py
@@ -87,6 +87,7 @@ 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)
@@ -271,10 +272,12 @@ class Decoder(srd.Decoder):
         ptype, data1, data2 = data
 
         if ptype == 'CS-CHANGE':
-            if data1 == -1:
-                if data2 == -1:
+            if data1 is None:
+                if data2 is None:
                     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
@@ -288,7 +291,8 @@ 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)