From b59c504ecda1693417932878a8c92bab80f9635c Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Tue, 6 Jun 2017 00:09:45 +0200 Subject: Add support for initial pin settings. Adapt all tests that require it to use the old behaviour of assuming an initial pin value of 0 (or whatever was previously hardcoded in the PD). for now (this will likely see some changes later). --- decoder/test/ds1307/test.conf | 2 +- decoder/test/i2c/test.conf | 2 +- decoder/test/jitter/test.conf | 2 +- decoder/test/parallel/test.conf | 4 ++-- decoder/test/spdif/test.conf | 2 +- decoder/test/swd/test.conf | 12 ++++++------ 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'decoder/test') diff --git a/decoder/test/ds1307/test.conf b/decoder/test/ds1307/test.conf index 8bf0650..052ed5d 100644 --- a/decoder/test/ds1307/test.conf +++ b/decoder/test/ds1307/test.conf @@ -1,5 +1,5 @@ test rtc_ds1307_200khz - protocol-decoder i2c channel scl=0 channel sda=1 + protocol-decoder i2c channel scl=0 channel sda=1 initial_pin scl=1 initial_pin sda=1 protocol-decoder ds1307 stack i2c ds1307 input i2c/rtc_dallas_ds1307/rtc_ds1307_200khz.sr diff --git a/decoder/test/i2c/test.conf b/decoder/test/i2c/test.conf index ed5535f..c9e7e5e 100644 --- a/decoder/test/i2c/test.conf +++ b/decoder/test/i2c/test.conf @@ -1,5 +1,5 @@ test rtc - protocol-decoder i2c channel scl=0 channel sda=1 + protocol-decoder i2c channel scl=0 channel sda=1 initial_pin scl=1 initial_pin 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 diff --git a/decoder/test/jitter/test.conf b/decoder/test/jitter/test.conf index 102938d..e61cb62 100644 --- a/decoder/test/jitter/test.conf +++ b/decoder/test/jitter/test.conf @@ -1,5 +1,5 @@ test toim4243 - protocol-decoder jitter channel clk=3 channel sig=2 option clk_polarity=falling option sig_polarity=falling + protocol-decoder jitter channel clk=3 channel sig=2 option clk_polarity=falling option sig_polarity=falling initial_pin clk=0 input uart/toim4243/toim4243_10byte_send_snippet.sr output jitter annotation match toim4243.output output jitter binary class ascii-float match toim4243.bin_ascii_float diff --git a/decoder/test/parallel/test.conf b/decoder/test/parallel/test.conf index b6dd18c..cf59c30 100644 --- a/decoder/test/parallel/test.conf +++ b/decoder/test/parallel/test.conf @@ -1,5 +1,5 @@ test incremental_8ch_short_noclock - protocol-decoder parallel channel d0=0 channel d1=1 channel d2=2 channel d3=3 channel d4=4 channel d5=5 channel d6=6 channel d7=7 + protocol-decoder parallel channel d0=0 channel d1=1 channel d2=2 channel d3=3 channel d4=4 channel d5=5 channel d6=6 channel d7=7 initial_pin d0=0 initial_pin d1=1 initial_pin d2=2 input misc/demo/incremental_8ch_short.sr output parallel annotation match incremental_8ch_short_noclock.output output parallel python match incremental_8ch_short_noclock.python @@ -11,7 +11,7 @@ test incremental_8ch_short_clock output parallel python match incremental_8ch_short_clock.python test incremental_8ch_long_noclock - protocol-decoder parallel channel d0=0 channel d1=1 channel d2=2 channel d3=3 channel d4=4 channel d5=5 channel d6=6 channel d7=7 + protocol-decoder parallel channel d0=0 channel d1=1 channel d2=2 channel d3=3 channel d4=4 channel d5=5 channel d6=6 channel d7=7 initial_pin d0=0 initial_pin d1=1 initial_pin d2=2 input misc/demo/incremental_8ch_long.sr output parallel annotation match incremental_8ch_long_noclock.output output parallel python match incremental_8ch_long_noclock.python diff --git a/decoder/test/spdif/test.conf b/decoder/test/spdif/test.conf index cb63b0d..539f565 100644 --- a/decoder/test/spdif/test.conf +++ b/decoder/test/spdif/test.conf @@ -4,6 +4,6 @@ test exception_samplerate output spdif exception match SamplerateError test 2ch-16bit-48khz - protocol-decoder spdif channel data=0 + protocol-decoder spdif channel data=0 initial_pin data=0 input spdif/2ch-16bit-48khz/2ch-16bit-48khz.sr output spdif annotation match 2ch-16bit-48khz.output diff --git a/decoder/test/swd/test.conf b/decoder/test/swd/test.conf index 95140bd..519a071 100644 --- a/decoder/test/swd/test.conf +++ b/decoder/test/swd/test.conf @@ -1,29 +1,29 @@ test ftdi_openocd_init_write_0xabbabeeb - protocol-decoder swd channel swclk=0 channel swdio=1 + protocol-decoder swd channel swclk=0 channel swdio=1 initial_pin swclk=0 initial_pin swdio=0 input swd/ftdi_openocd/init_write_0xabbabeeb.sr output swd annotation match ftdi_openocd/init_write_0xabbabeeb.output output swd python match ftdi_openocd/init_write_0xabbabeeb.python test ftdi_openocd_init_noreply - protocol-decoder swd channel swclk=0 channel swdio=1 + protocol-decoder swd channel swclk=0 channel swdio=1 initial_pin swclk=0 initial_pin swdio=0 input swd/ftdi_openocd/init_noreply.sr output swd annotation match ftdi_openocd/init_noreply.output output swd python match ftdi_openocd/init_noreply.python test ftdi_openocd_init_wait_fault - protocol-decoder swd channel swclk=0 channel swdio=1 + protocol-decoder swd channel swclk=0 channel swdio=1 initial_pin swclk=0 initial_pin swdio=0 input swd/ftdi_openocd/init_wait_fault.sr output swd annotation match ftdi_openocd/init_wait_fault.output output swd python match ftdi_openocd/init_wait_fault.python test stlink_init_write_0xabbabeeb - protocol-decoder swd channel swclk=0 channel swdio=1 + protocol-decoder swd channel swclk=0 channel swdio=1 initial_pin swclk=0 initial_pin swdio=0 input swd/stlink_openocd/init_write_0xabbabeeb.sr output swd annotation match stlink_openocd/init_write_0xabbabeeb.output output swd python match stlink_openocd/init_write_0xabbabeeb.python test stlink_wait_retry - protocol-decoder swd channel swclk=0 channel swdio=1 + protocol-decoder swd channel swclk=0 channel swdio=1 initial_pin swclk=0 initial_pin swdio=0 input swd/stlink_openocd/wait_retry.sr output swd annotation match stlink_openocd/wait_retry.output output swd python match stlink_openocd/wait_retry.python @@ -31,7 +31,7 @@ test stlink_wait_retry # With the strict_start option set, this capture doesn't include a LINERESET # so output is empty. test stlink_wait_retry - protocol-decoder swd channel swclk=0 channel swdio=1 option strict_start=yes + protocol-decoder swd channel swclk=0 channel swdio=1 option strict_start=yes initial_pin swclk=0 initial_pin swdio=0 input swd/stlink_openocd/wait_retry.sr output swd annotation match stlink_openocd/empty.output output swd python match stlink_openocd/empty.python -- cgit v1.2.3-70-g09d2