From 6a15597a7b3f901b566b7bfc8c484a14e0fb6a11 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Sun, 13 Apr 2014 19:57:43 +0200 Subject: 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'. --- decoders/i2c/pd.py | 2 +- decoders/i2c/test/test.conf | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'decoders/i2c') diff --git a/decoders/i2c/pd.py b/decoders/i2c/pd.py index 1770838..6bf12b9 100644 --- a/decoders/i2c/pd.py +++ b/decoders/i2c/pd.py @@ -72,7 +72,7 @@ class Decoder(srd.Decoder): license = 'gplv2+' inputs = ['logic'] outputs = ['i2c'] - probes = ( + channels = ( {'id': 'scl', 'name': 'SCL', 'desc': 'Serial clock line'}, {'id': 'sda', 'name': 'SDA', 'desc': 'Serial data line'}, ) diff --git a/decoders/i2c/test/test.conf b/decoders/i2c/test/test.conf index 880f360..bd1068b 100644 --- a/decoders/i2c/test/test.conf +++ b/decoders/i2c/test/test.conf @@ -1,5 +1,5 @@ test rtc - protocol-decoder i2c probe scl=0 probe sda=1 + protocol-decoder i2c channel scl=0 channel sda=1 input i2c/rtc_dallas_ds1307/rtc_ds1307_200khz.sr output i2c annotation class data-read match rtc_ds1307_200khz_data_read.output output i2c annotation class data-write match rtc_ds1307_200khz_data_write.output @@ -7,13 +7,13 @@ test rtc output i2c python match rtc_ds1307_200khz.python test motherboard - protocol-decoder i2c probe scl=0 probe sda=3 + protocol-decoder i2c channel scl=0 channel sda=3 input i2c/gigabyte_6vle-vxl_i2c/gigabyte_6vle_vxl_i2c.sr output i2c annotation match gigabyte_6vle_vxl_i2c.output output i2c python match gigabyte_6vle_vxl_i2c.python test xfp - protocol-decoder i2c probe scl=0 probe sda=1 + protocol-decoder i2c channel scl=0 channel sda=1 input i2c/network-transceivers/xfp.sr output i2c binary class data-read match xfp_data_read.binary output i2c binary class data-write match xfp_data_write.binary -- cgit v1.2.3-70-g09d2