From 29f8bb7b787ff8bc2a2e55d3de0b53452e73c6af Mon Sep 17 00:00:00 2001
From: Uwe Hermann <uwe@hermann-uwe.de>
Date: Thu, 12 Sep 2013 21:05:22 +0200
Subject: spi: Provide multiple annotation types.
For now SPI gets the following annotation types:
- MISO/MOSI SPI data
- MISO SPI data
- MOSI SPI data
(i.e. you can see either MISO, or MOSI, or both; the latter is most
useful for CLI usage)
Also, show the hex values as e.g. F5 (upper-case letters, no "0x" prefix).
---
decoders/spi/pd.py | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/decoders/spi/pd.py b/decoders/spi/pd.py
index 1dff414..47bbe32 100644
--- a/decoders/spi/pd.py
+++ b/decoders/spi/pd.py
@@ -60,7 +60,9 @@ class Decoder(srd.Decoder):
'format': ['Data format', 'hex'],
}
annotations = [
- ['Data', 'SPI data'],
+ ['MISO/MOSI data', 'MISO/MOSI SPI data'],
+ ['MISO data', 'MISO SPI data'],
+ ['MOSI data', 'MOSI SPI data'],
['Warnings', 'Human-readable warnings'],
]
@@ -150,11 +152,12 @@ class Decoder(srd.Decoder):
continue
self.putpw(['DATA', self.mosidata, self.misodata])
- self.putw([0, ['MOSI: 0x%02x, MISO: 0x%02x' % (self.mosidata,
- self.misodata)]])
+ self.putw([0, ['%02X/%02X' % (self.mosidata, self.misodata)]])
+ self.putw([1, ['%02X' % self.misodata]])
+ self.putw([2, ['%02X' % self.mosidata]])
if self.cs_was_deasserted_during_data_word:
- self.putw([1, ['CS# was deasserted during this data word!']])
+ self.putw([3, ['CS# was deasserted during this data word!']])
# Reset decoder state.
self.mosidata = 0
--
cgit v1.2.3-70-g09d2