From 808c6e7496410ea473c1a625530fd15f779b542e Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Sun, 2 Feb 2014 21:03:47 +0100 Subject: [PATCH] spi: Fix incorrect dataword endsample numbers. --- decoders/spi/pd.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/decoders/spi/pd.py b/decoders/spi/pd.py index 2d971d3..cd40946 100644 --- a/decoders/spi/pd.py +++ b/decoders/spi/pd.py @@ -150,9 +150,11 @@ class Decoder(srd.Decoder): # Dataword annotations. if self.have_miso: - self.putw([0, ['%02X' % self.misodata]]) + ss, es = self.misobits[0][1], self.misobits[-1][2] + self.put(ss, es, self.out_ann, [0, ['%02X' % self.misodata]]) if self.have_mosi: - self.putw([1, ['%02X' % self.mosidata]]) + ss, es = self.mosibits[0][1], self.mosibits[-1][2] + self.put(ss, es, self.out_ann, [1, ['%02X' % self.mosidata]]) def reset_decoder_state(self): self.misodata = 0 if self.have_miso else None @@ -187,7 +189,7 @@ class Decoder(srd.Decoder): else: self.mosidata |= mosi << self.bitcount - # Guesstimate the endsample for this bit (can be overridden later). + # Guesstimate the endsample for this bit (can be overridden below). es = self.samplenum if self.bitcount > 0: es += self.samplenum - self.misobits[self.bitcount - 1][1] -- 2.30.2