diff options
| author | Uwe Hermann <uwe@hermann-uwe.de> | 2014-04-13 19:57:43 +0200 |
|---|---|---|
| committer | Uwe Hermann <uwe@hermann-uwe.de> | 2014-04-13 22:00:26 +0200 |
| commit | 6a15597a7b3f901b566b7bfc8c484a14e0fb6a11 (patch) | |
| tree | ee7241fa022b1b77f61affd373ff8baddb92d404 /decoders/spi | |
| parent | 486858f7208207fb12a281640c5f6e9be4e4626f (diff) | |
| download | libsigrokdecode-6a15597a7b3f901b566b7bfc8c484a14e0fb6a11.tar.gz libsigrokdecode-6a15597a7b3f901b566b7bfc8c484a14e0fb6a11.zip | |
Rename 'probe' to 'channel' everywhere.
Variables of type 'struct srd_channel *' are consistently named 'pdch' to
make them easily distinguishable from libsigrok's 'struct sr_channel *'
variables that are consistently named 'ch'.
Diffstat (limited to 'decoders/spi')
| -rw-r--r-- | decoders/spi/pd.py | 6 | ||||
| -rw-r--r-- | decoders/spi/test/test.conf | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/decoders/spi/pd.py b/decoders/spi/pd.py index 7d84b3d..b1a8704 100644 --- a/decoders/spi/pd.py +++ b/decoders/spi/pd.py @@ -31,7 +31,7 @@ Commands: - 'DATA': <data1> contains the MISO data, <data2> contains the MOSI data. The data is _usually_ 8 bits (but can also be fewer or more bits). Both data items are Python numbers (not strings), or None if the respective - probe was not supplied. + channel was not supplied. - 'BITS': <data1>/<data2> contain a list of bit values in this MISO/MOSI data item, and for each of those also their respective start-/endsample numbers. - 'CS CHANGE': <data1> is the old CS# pin value, <data2> is the new value. @@ -69,10 +69,10 @@ class Decoder(srd.Decoder): license = 'gplv2+' inputs = ['logic'] outputs = ['spi'] - probes = ( + channels = ( {'id': 'clk', 'name': 'CLK', 'desc': 'Clock'}, ) - optional_probes = ( + optional_channels = ( {'id': 'miso', 'name': 'MISO', 'desc': 'Master in, slave out'}, {'id': 'mosi', 'name': 'MOSI', 'desc': 'Master out, slave in'}, {'id': 'cs', 'name': 'CS#', 'desc': 'Chip-select'}, diff --git a/decoders/spi/test/test.conf b/decoders/spi/test/test.conf index d5531b1..e08b788 100644 --- a/decoders/spi/test/test.conf +++ b/decoders/spi/test/test.conf @@ -1,11 +1,11 @@ test atmega32_00 - protocol-decoder spi probe cs=0 probe mosi=1 probe clk=2 + protocol-decoder spi channel cs=0 channel mosi=1 channel clk=2 input spi/spi_atmega32/spi_atmega32_00.sr output spi annotation class mosi-data match atmega32_00_mosi.output output spi annotation class miso-data match atmega32_00_miso.output test mx25l1605d_probe - protocol-decoder spi probe cs=0 probe miso=1 probe clk=2 probe mosi=3 + protocol-decoder spi channel cs=0 channel miso=1 channel clk=2 channel mosi=3 input spi/mx25l1605d/mx25l1605d_probe.sr output spi annotation class mosi-data match mx25l1605d_probe_mosi.output output spi annotation class miso-data match mx25l1605d_probe_miso.output |