uart: Updates due to recent PD option renames.

diff --git a/decoder/test/modbus/test.conf b/decoder/test/modbus/test.conf
index 2964abf8e18e66442030b69b161e07f278577c5c..a755124fd170468dbf09ff88ce503519dd410cfa 100644 (file)
--- a/decoder/test/modbus/test.conf
+++ b/decoder/test/modbus/test.conf
@@ -1,5 +1,5 @@
 test brainchild_io_16do
-       protocol-decoder uart channel rx=0 channel tx=1 option baudrate=19200 option invert_rx=yes option invert_tx=yes option parity_type=even
+       protocol-decoder uart channel rx=0 channel tx=1 option baudrate=19200 option invert_rx=yes option invert_tx=yes option parity=even
        protocol-decoder modbus option scchannel=RX option cschannel=TX
        stack uart modbus
        input uart/modbus_rtu/brainchild_io_16do/brainchild-io-16do.sr

diff --git a/decoder/test/uart/test.conf b/decoder/test/uart/test.conf
index 3bd5eb377a018b157a7ae4c9df2857736e73d293..a0200a641410a79a6deba0bab3529f70941d31f6 100644 (file)
--- a/decoder/test/uart/test.conf
+++ b/decoder/test/uart/test.conf
@@ -10,7 +10,7 @@ test trekstor_ebr30_a
        output uart binary class rxtx match trekstor_bin_rx.output
 
 test hello_world_7o1_115200
-       protocol-decoder uart channel tx=0 option baudrate=115200 option parity_type=odd option num_data_bits=7 option format=ascii
+       protocol-decoder uart channel tx=0 option baudrate=115200 option parity=odd option data_bits=7 option format=ascii
        input uart/hello_world/7o1/hello_world_7o1_115200.sr
        output uart annotation match hello_world_7o1_115200.output
        output uart python match hello_world_7o1_115200.python
@@ -18,28 +18,28 @@ test hello_world_7o1_115200
 
 # Intentionally cause parity errors.
 test hello_world_7o1_115200_parity_err
-       protocol-decoder uart channel tx=0 option baudrate=115200 option parity_type=even option num_data_bits=7 option format=ascii
+       protocol-decoder uart channel tx=0 option baudrate=115200 option parity=even option data_bits=7 option format=ascii
        input uart/hello_world/7o1/hello_world_7o1_115200.sr
        output uart annotation match hello_world_7o1_115200_parity_err.output
        output uart python match hello_world_7o1_115200_parity_err.python
        output uart binary class tx match hello_world_7o1_115200_parity_err.bin_tx
 
 test hello_world_7o1_115200_parity_ignore
-       protocol-decoder uart channel tx=0 option baudrate=115200 option parity_type=ignore option num_data_bits=7 option format=ascii
+       protocol-decoder uart channel tx=0 option baudrate=115200 option parity=ignore option data_bits=7 option format=ascii
        input uart/hello_world/7o1/hello_world_7o1_115200.sr
        output uart annotation match hello_world_7o1_115200_parity_ignore.output
        output uart python match hello_world_7o1_115200_parity_ignore.python
        output uart binary class tx match hello_world_7o1_115200_parity_ignore.bin_tx
 
 test hello_world_7e1_115200
-       protocol-decoder uart channel tx=0 option baudrate=115200 option parity_type=even option num_data_bits=7 option format=ascii
+       protocol-decoder uart channel tx=0 option baudrate=115200 option parity=even option data_bits=7 option format=ascii
        input uart/hello_world/7e1/hello_world_7e1_115200.sr
        output uart annotation match hello_world_7e1_115200.output
        output uart python match hello_world_7e1_115200.python
        output uart binary class tx match hello_world_7e1_115200.bin_tx
 
 test hello_world_8e1_115200
-       protocol-decoder uart channel tx=0 option baudrate=115200 option parity_type=even option format=ascii
+       protocol-decoder uart channel tx=0 option baudrate=115200 option parity=even option format=ascii
        input uart/hello_world/8e1/hello_world_8e1_115200.sr
        output uart annotation match hello_world_8e1_115200.output
        output uart python match hello_world_8e1_115200.python
@@ -123,7 +123,7 @@ test hello_world_8n1_921600
        output uart binary class tx match hello_world_8n1_921600.bin_tx
 
 test hello_world_8o1_115200
-       protocol-decoder uart channel tx=0 option baudrate=115200 option parity_type=odd option format=ascii
+       protocol-decoder uart channel tx=0 option baudrate=115200 option parity=odd option format=ascii
        input uart/hello_world/8o1/hello_world_8o1_115200.sr
        output uart annotation match hello_world_8o1_115200.output
        output uart python match hello_world_8o1_115200.python
@@ -138,203 +138,203 @@ test rxtx_overlapped
        output uart binary class tx match rxtx_overlapped.bin_tx
 
 test uart_count_19200_5n1_hex
-       protocol-decoder uart channel tx=0 option baudrate=19200 option num_data_bits=5 option format=hex option tx_packet_len=16
+       protocol-decoder uart channel tx=0 option baudrate=19200 option data_bits=5 option format=hex option tx_packet_len=16
        input uart/counter/uart_count_19200_5n1.sr
        output uart annotation match uart_count_19200_5n1_hex.output
        output uart python match uart_count_19200_5n1.python
        output uart binary class tx match uart_count_19200_5n1.bin_tx
 
 test uart_count_19200_5n1_ascii
-       protocol-decoder uart channel tx=0 option baudrate=19200 option num_data_bits=5 option format=ascii
+       protocol-decoder uart channel tx=0 option baudrate=19200 option data_bits=5 option format=ascii
        input uart/counter/uart_count_19200_5n1.sr
        output uart annotation match uart_count_19200_5n1_ascii.output
        output uart python match uart_count_19200_5n1.python
        output uart binary class tx match uart_count_19200_5n1.bin_tx
 
 test uart_count_19200_5n1_dec
-       protocol-decoder uart channel tx=0 option baudrate=19200 option num_data_bits=5 option format=dec option tx_packet_len=16
+       protocol-decoder uart channel tx=0 option baudrate=19200 option data_bits=5 option format=dec option tx_packet_len=16
        input uart/counter/uart_count_19200_5n1.sr
        output uart annotation match uart_count_19200_5n1_dec.output
        output uart python match uart_count_19200_5n1.python
        output uart binary class tx match uart_count_19200_5n1.bin_tx
 
 test uart_count_19200_5n1_oct
-       protocol-decoder uart channel tx=0 option baudrate=19200 option num_data_bits=5 option format=oct
+       protocol-decoder uart channel tx=0 option baudrate=19200 option data_bits=5 option format=oct
        input uart/counter/uart_count_19200_5n1.sr
        output uart annotation match uart_count_19200_5n1_oct.output
        output uart python match uart_count_19200_5n1.python
        output uart binary class tx match uart_count_19200_5n1.bin_tx
 
 test uart_count_19200_5n1_bin
-       protocol-decoder uart channel tx=0 option baudrate=19200 option num_data_bits=5 option format=bin
+       protocol-decoder uart channel tx=0 option baudrate=19200 option data_bits=5 option format=bin
        input uart/counter/uart_count_19200_5n1.sr
        output uart annotation match uart_count_19200_5n1_bin.output
        output uart python match uart_count_19200_5n1.python
        output uart binary class tx match uart_count_19200_5n1.bin_tx
 
 test uart_count_19200_6n1
-       protocol-decoder uart channel tx=0 option baudrate=19200 option num_data_bits=6 option format=hex option tx_packet_len=16
+       protocol-decoder uart channel tx=0 option baudrate=19200 option data_bits=6 option format=hex option tx_packet_len=16
        input uart/counter/uart_count_19200_6n1.sr
        output uart annotation match uart_count_19200_6n1_hex.output
        output uart python match uart_count_19200_6n1.python
        output uart binary class tx match uart_count_19200_6n1.bin_tx
 
 test uart_count_19200_6n1
-       protocol-decoder uart channel tx=0 option baudrate=19200 option num_data_bits=6 option format=ascii
+       protocol-decoder uart channel tx=0 option baudrate=19200 option data_bits=6 option format=ascii
        input uart/counter/uart_count_19200_6n1.sr
        output uart annotation match uart_count_19200_6n1_ascii.output
        output uart python match uart_count_19200_6n1.python
        output uart binary class tx match uart_count_19200_6n1.bin_tx
 
 test uart_count_19200_6n1
-       protocol-decoder uart channel tx=0 option baudrate=19200 option num_data_bits=6 option format=dec option tx_packet_len=16
+       protocol-decoder uart channel tx=0 option baudrate=19200 option data_bits=6 option format=dec option tx_packet_len=16
        input uart/counter/uart_count_19200_6n1.sr
        output uart annotation match uart_count_19200_6n1_dec.output
        output uart python match uart_count_19200_6n1.python
        output uart binary class tx match uart_count_19200_6n1.bin_tx
 
 test uart_count_19200_6n1
-       protocol-decoder uart channel tx=0 option baudrate=19200 option num_data_bits=6 option format=oct
+       protocol-decoder uart channel tx=0 option baudrate=19200 option data_bits=6 option format=oct
        input uart/counter/uart_count_19200_6n1.sr
        output uart annotation match uart_count_19200_6n1_oct.output
        output uart python match uart_count_19200_6n1.python
        output uart binary class tx match uart_count_19200_6n1.bin_tx
 
 test uart_count_19200_6n1
-       protocol-decoder uart channel tx=0 option baudrate=19200 option num_data_bits=6 option format=bin
+       protocol-decoder uart channel tx=0 option baudrate=19200 option data_bits=6 option format=bin
        input uart/counter/uart_count_19200_6n1.sr
        output uart annotation match uart_count_19200_6n1_bin.output
        output uart python match uart_count_19200_6n1.python
        output uart binary class tx match uart_count_19200_6n1.bin_tx
 
 test uart_count_19200_7n1
-       protocol-decoder uart channel tx=0 option baudrate=19200 option num_data_bits=7 option format=hex option tx_packet_len=16
+       protocol-decoder uart channel tx=0 option baudrate=19200 option data_bits=7 option format=hex option tx_packet_len=16
        input uart/counter/uart_count_19200_7n1.sr
        output uart annotation match uart_count_19200_7n1_hex.output
        output uart python match uart_count_19200_7n1.python
        output uart binary class tx match uart_count_19200_7n1.bin_tx
 
 test uart_count_19200_7n1
-       protocol-decoder uart channel tx=0 option baudrate=19200 option num_data_bits=7 option format=ascii
+       protocol-decoder uart channel tx=0 option baudrate=19200 option data_bits=7 option format=ascii
        input uart/counter/uart_count_19200_7n1.sr
        output uart annotation match uart_count_19200_7n1_ascii.output
        output uart python match uart_count_19200_7n1.python
        output uart binary class tx match uart_count_19200_7n1.bin_tx
 
 test uart_count_19200_7n1
-       protocol-decoder uart channel tx=0 option baudrate=19200 option num_data_bits=7 option format=dec option tx_packet_len=16
+       protocol-decoder uart channel tx=0 option baudrate=19200 option data_bits=7 option format=dec option tx_packet_len=16
        input uart/counter/uart_count_19200_7n1.sr
        output uart annotation match uart_count_19200_7n1_dec.output
        output uart python match uart_count_19200_7n1.python
        output uart binary class tx match uart_count_19200_7n1.bin_tx
 
 test uart_count_19200_7n1
-       protocol-decoder uart channel tx=0 option baudrate=19200 option num_data_bits=7 option format=oct
+       protocol-decoder uart channel tx=0 option baudrate=19200 option data_bits=7 option format=oct
        input uart/counter/uart_count_19200_7n1.sr
        output uart annotation match uart_count_19200_7n1_oct.output
        output uart python match uart_count_19200_7n1.python
        output uart binary class tx match uart_count_19200_7n1.bin_tx
 
 test uart_count_19200_7n1
-       protocol-decoder uart channel tx=0 option baudrate=19200 option num_data_bits=7 option format=bin
+       protocol-decoder uart channel tx=0 option baudrate=19200 option data_bits=7 option format=bin
        input uart/counter/uart_count_19200_7n1.sr
        output uart annotation match uart_count_19200_7n1_bin.output
        output uart python match uart_count_19200_7n1.python
        output uart binary class tx match uart_count_19200_7n1.bin_tx
 
 test uart_count_19200_8n1
-       protocol-decoder uart channel tx=0 option baudrate=19200 option num_data_bits=8 option format=hex option tx_packet_len=16
+       protocol-decoder uart channel tx=0 option baudrate=19200 option data_bits=8 option format=hex option tx_packet_len=16
        input uart/counter/uart_count_19200_8n1.sr
        output uart annotation match uart_count_19200_8n1_hex.output
        output uart python match uart_count_19200_8n1.python
        output uart binary class tx match uart_count_19200_8n1.bin_tx
 
 test uart_count_19200_8n1
-       protocol-decoder uart channel tx=0 option baudrate=19200 option num_data_bits=8 option format=ascii option tx_packet_len=16
+       protocol-decoder uart channel tx=0 option baudrate=19200 option data_bits=8 option format=ascii option tx_packet_len=16
        input uart/counter/uart_count_19200_8n1.sr
        output uart annotation match uart_count_19200_8n1_ascii.output
        output uart python match uart_count_19200_8n1.python
        output uart binary class tx match uart_count_19200_8n1.bin_tx
 
 test uart_count_19200_8n1
-       protocol-decoder uart channel tx=0 option baudrate=19200 option num_data_bits=8 option format=dec option tx_packet_len=16
+       protocol-decoder uart channel tx=0 option baudrate=19200 option data_bits=8 option format=dec option tx_packet_len=16
        input uart/counter/uart_count_19200_8n1.sr
        output uart annotation match uart_count_19200_8n1_dec.output
        output uart python match uart_count_19200_8n1.python
        output uart binary class tx match uart_count_19200_8n1.bin_tx
 
 test uart_count_19200_8n1
-       protocol-decoder uart channel tx=0 option baudrate=19200 option num_data_bits=8 option format=oct option tx_packet_len=16
+       protocol-decoder uart channel tx=0 option baudrate=19200 option data_bits=8 option format=oct option tx_packet_len=16
        input uart/counter/uart_count_19200_8n1.sr
        output uart annotation match uart_count_19200_8n1_oct.output
        output uart python match uart_count_19200_8n1.python
        output uart binary class tx match uart_count_19200_8n1.bin_tx
 
 test uart_count_19200_8n1
-       protocol-decoder uart channel tx=0 option baudrate=19200 option num_data_bits=8 option format=bin option tx_packet_len=16
+       protocol-decoder uart channel tx=0 option baudrate=19200 option data_bits=8 option format=bin option tx_packet_len=16
        input uart/counter/uart_count_19200_8n1.sr
        output uart annotation match uart_count_19200_8n1_bin.output
        output uart python match uart_count_19200_8n1.python
        output uart binary class tx match uart_count_19200_8n1.bin_tx
 
 test uart_count_19200_9n1
-       protocol-decoder uart channel tx=0 option baudrate=19200 option num_data_bits=9 option format=hex option tx_packet_len=16
+       protocol-decoder uart channel tx=0 option baudrate=19200 option data_bits=9 option format=hex option tx_packet_len=16
        input uart/counter/uart_count_19200_9n1.sr
        output uart annotation match uart_count_19200_9n1_hex.output
        output uart python match uart_count_19200_9n1.python
        output uart binary class tx match uart_count_19200_9n1.bin_tx
 
 test uart_count_19200_9n1
-       protocol-decoder uart channel tx=0 option baudrate=19200 option num_data_bits=9 option format=ascii
+       protocol-decoder uart channel tx=0 option baudrate=19200 option data_bits=9 option format=ascii
        input uart/counter/uart_count_19200_9n1.sr
        output uart annotation match uart_count_19200_9n1_ascii.output
        output uart python match uart_count_19200_9n1.python
        output uart binary class tx match uart_count_19200_9n1.bin_tx
 
 test uart_count_19200_9n1
-       protocol-decoder uart channel tx=0 option baudrate=19200 option num_data_bits=9 option format=dec option tx_packet_len=16
+       protocol-decoder uart channel tx=0 option baudrate=19200 option data_bits=9 option format=dec option tx_packet_len=16
        input uart/counter/uart_count_19200_9n1.sr
        output uart annotation match uart_count_19200_9n1_dec.output
        output uart python match uart_count_19200_9n1.python
        output uart binary class tx match uart_count_19200_9n1.bin_tx
 
 test uart_count_19200_9n1
-       protocol-decoder uart channel tx=0 option baudrate=19200 option num_data_bits=9 option format=oct
+       protocol-decoder uart channel tx=0 option baudrate=19200 option data_bits=9 option format=oct
        input uart/counter/uart_count_19200_9n1.sr
        output uart annotation match uart_count_19200_9n1_oct.output
        output uart python match uart_count_19200_9n1.python
        output uart binary class tx match uart_count_19200_9n1.bin_tx
 
 test uart_count_19200_9n1
-       protocol-decoder uart channel tx=0 option baudrate=19200 option num_data_bits=9 option format=bin
+       protocol-decoder uart channel tx=0 option baudrate=19200 option data_bits=9 option format=bin
        input uart/counter/uart_count_19200_9n1.sr
        output uart annotation match uart_count_19200_9n1_bin.output
        output uart python match uart_count_19200_9n1.python
        output uart binary class tx match uart_count_19200_9n1.bin_tx
 
 test cyrustek_es51978
-       protocol-decoder uart channel rx=0 option baudrate=2400 option num_data_bits=7 option parity_type=odd option format=ascii option rx_packet_delimiter=10
+       protocol-decoder uart channel rx=0 option baudrate=2400 option data_bits=7 option parity=odd option format=ascii option rx_packet_delim=10
        input uart/cyrustek_es51978/es51978.sr
        output uart annotation match cyrustek_es51978.output
        output uart python match cyrustek_es51978.python
        output uart binary class rx match cyrustek_es51978.bin_rx
 
 test mtk3339_8n1_9600
-       protocol-decoder uart channel tx=0 option baudrate=9600 option format=ascii option tx_packet_delimiter=10
+       protocol-decoder uart channel tx=0 option baudrate=9600 option format=ascii option tx_packet_delim=10
        input uart/gps/mtk3339/mtk3339_8n1_9600.sr
        output uart annotation match mtk3339_8n1_9600.output
        output uart python match mtk3339_8n1_9600.python
        output uart binary class tx match mtk3339_8n1_9600.bin_tx
 
 test kern_ew_6200-2nm_tare
-       protocol-decoder uart channel rx=0 option baudrate=1200 option format=ascii option rx_packet_delimiter=10
+       protocol-decoder uart channel rx=0 option baudrate=1200 option format=ascii option rx_packet_delim=10
        input uart/kern_ew_6200-2nm/kern_ew_6200-2nm_tare.sr
        output uart annotation match kern_ew_6200-2nm_tare.output
        output uart python match kern_ew_6200-2nm_tare.python
        output uart binary class rx match kern_ew_6200-2nm_tare.bin_rx
 
 test max3232e_hello_world_57600_8n1
-       protocol-decoder uart channel rx=1 channel tx=2 option baudrate=57600 option format=ascii option invert_rx=yes option rx_packet_delimiter=10 option tx_packet_delimiter=10
+       protocol-decoder uart channel rx=1 channel tx=2 option baudrate=57600 option format=ascii option invert_rx=yes option rx_packet_delim=10 option tx_packet_delim=10
        input uart/maxim_max3232e/max3232e_hello_world_57600_8n1.sr
        output uart annotation match max3232e_hello_world_57600_8n1.output
        output uart python match max3232e_hello_world_57600_8n1.python