X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Fspi%2Fpd.py;h=fd9a78fd7d87c3a9568c519676ffc695c9687fbf;hp=7cfa2662adbfbf957ba2895fa8df2fd85ec231a6;hb=HEAD;hpb=a69b0f0bfe92106228252eed05c1ce22859f15d8

diff --git a/decoders/spi/pd.py b/decoders/spi/pd.py
index 7cfa266..fd9a78f 100644
--- a/decoders/spi/pd.py
+++ b/decoders/spi/pd.py
@@ -105,19 +105,19 @@ class Decoder(srd.Decoder):
     annotations = (
         ('miso-data', 'MISO data'),
         ('mosi-data', 'MOSI data'),
-        ('miso-bits', 'MISO bits'),
-        ('mosi-bits', 'MOSI bits'),
-        ('warnings', 'Human-readable warnings'),
+        ('miso-bit', 'MISO bit'),
+        ('mosi-bit', 'MOSI bit'),
+        ('warning', 'Warning'),
         ('miso-transfer', 'MISO transfer'),
         ('mosi-transfer', 'MOSI transfer'),
     )
     annotation_rows = (
-        ('miso-data', 'MISO data', (0,)),
         ('miso-bits', 'MISO bits', (2,)),
-        ('miso-transfer', 'MISO transfer', (5,)),
-        ('mosi-data', 'MOSI data', (1,)),
+        ('miso-data-vals', 'MISO data', (0,)),
+        ('miso-transfers', 'MISO transfers', (5,)),
         ('mosi-bits', 'MOSI bits', (3,)),
-        ('mosi-transfer', 'MOSI transfer', (6,)),
+        ('mosi-data-vals', 'MOSI data', (1,)),
+        ('mosi-transfers', 'MOSI transfers', (6,)),
         ('other', 'Other', (4,)),
     )
     binary = (
@@ -137,7 +137,6 @@ class Decoder(srd.Decoder):
         self.misobytes = []
         self.mosibytes = []
         self.ss_block = -1
-        self.samplenum = -1
         self.ss_transfer = -1
         self.cs_was_deasserted = False
         self.have_cs = self.have_miso = self.have_mosi = None
@@ -279,7 +278,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)]])