modbus: Make C->S and S->C configurable, add framegap option.

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

diff --git a/decoders/spi/pd.py b/decoders/spi/pd.py
index 7cfa2662adbfbf957ba2895fa8df2fd85ec231a6..952b0666bb4c09826715f458fe8a286a3d866e7f 100644 (file)
--- a/decoders/spi/pd.py
+++ b/decoders/spi/pd.py
@@ -112,11 +112,11 @@ class Decoder(srd.Decoder):
         ('mosi-transfer', 'MOSI transfer'),
     )
     annotation_rows = (
-        ('miso-data', 'MISO data', (0,)),
         ('miso-bits', 'MISO bits', (2,)),
+        ('miso-data', 'MISO data', (0,)),
         ('miso-transfer', 'MISO transfer', (5,)),
-        ('mosi-data', 'MOSI data', (1,)),
         ('mosi-bits', 'MOSI bits', (3,)),
+        ('mosi-data', 'MOSI data', (1,)),
         ('mosi-transfer', 'MOSI transfer', (6,)),
         ('other', 'Other', (4,)),
     )
@@ -279,7 +279,7 @@ class Decoder(srd.Decoder):
                 self.ss_transfer = self.samplenum
                 self.misobytes = []
                 self.mosibytes = []
-            else:
+            elif self.ss_transfer != -1:
                 if self.have_miso:
                     self.put(self.ss_transfer, self.samplenum, self.out_ann,
                         [5, [' '.join(format(x.val, '02X') for x in self.misobytes)]])