X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoder%2Ftest%2Fcan%2Ftest.conf;h=03e314390d434c44e2bbff6dbce284936001ed30;hb=b23266227ada677fd5c25a5083cd0fe46b15dae9;hp=c79ae6378b06002757b95e6c1e28f6e57ea7a767;hpb=fc7b9238de72f69ff7027cef2976f9ba87963f17;p=sigrok-test.git

diff --git a/decoder/test/can/test.conf b/decoder/test/can/test.conf
index c79ae63..03e3143 100644
--- a/decoder/test/can/test.conf
+++ b/decoder/test/can/test.conf
@@ -4,36 +4,77 @@ test exception_samplerate
 	output can exception match SamplerateError
 
 test mcp2515dm-bm-125kbits_msg_222_5bytes
-	protocol-decoder can channel can_rx=2 option bitrate=125000
+	protocol-decoder can channel can_rx=2 option nominal_bitrate=125000
 	input can/microchip_mcp2515dm-bm/mcp2515dm-bm-125kbits_msg_222_5bytes.sr
 	output can annotation match mcp2515dm-bm-125kbits_msg_222_5bytes.output
 
 test mcp2515dm-bm-125kbits_extmsg_11223344_7bytes
-	protocol-decoder can channel can_rx=2 option bitrate=125000
+	protocol-decoder can channel can_rx=2 option nominal_bitrate=125000
 	input can/microchip_mcp2515dm-bm/mcp2515dm-bm-125kbits_extmsg_11223344_7bytes.sr
 	output can annotation match mcp2515dm-bm-125kbits_extmsg_11223344_7bytes.output
 
 test mcp2515dm-bm-125kbits_bus_load_100percent
-	protocol-decoder can channel can_rx=2 option bitrate=125000
+	protocol-decoder can channel can_rx=2 option nominal_bitrate=125000
 	input can/microchip_mcp2515dm-bm/mcp2515dm-bm-125kbits_bus_load_100percent.sr
 	output can annotation match mcp2515dm-bm-125kbits_bus_load_100percent.output
 
 test mcp2515dm-bm-125kbits_bus_load_75percent
-	protocol-decoder can channel can_rx=2 option bitrate=125000
+	protocol-decoder can channel can_rx=2 option nominal_bitrate=125000
 	input can/microchip_mcp2515dm-bm/mcp2515dm-bm-125kbits_bus_load_75percent.sr
 	output can annotation match mcp2515dm-bm-125kbits_bus_load_75percent.output
 
 test mcp2515dm-bm-125kbits_bus_load_50percent
-	protocol-decoder can channel can_rx=2 option bitrate=125000
+	protocol-decoder can channel can_rx=2 option nominal_bitrate=125000
 	input can/microchip_mcp2515dm-bm/mcp2515dm-bm-125kbits_bus_load_50percent.sr
 	output can annotation match mcp2515dm-bm-125kbits_bus_load_50percent.output
 
 test mcp2515dm-bm-125kbits_bus_load_25percent
-	protocol-decoder can channel can_rx=2 option bitrate=125000
+	protocol-decoder can channel can_rx=2 option nominal_bitrate=125000
 	input can/microchip_mcp2515dm-bm/mcp2515dm-bm-125kbits_bus_load_25percent.sr
 	output can annotation match mcp2515dm-bm-125kbits_bus_load_25percent.output
 
+# Note: The samplerate of this file is rather low (500kHz).
 test nmea2000_fuel_flow_gps_snippet
-	protocol-decoder can channel can_rx=0 option bitrate=250000
+	protocol-decoder can channel can_rx=0 option nominal_bitrate=250000
 	input can/nmea2000/lowrance_ep_60r_garmin_gps_17x/nmea2000_fuel_flow_gps_snippet.sr
 	output can annotation match nmea2000_fuel_flow_gps_snippet.output
+
+test can_fd_std_without_brs_8
+	protocol-decoder can channel can_rx=0 option nominal_bitrate=1000000
+	input can/can_fd/arbitrary_traffic/can_fd_std_without_brs_8.sr
+	output can annotation match can_fd_std_without_brs_8.output
+
+test can_fd_std_without_brs_64
+	protocol-decoder can channel can_rx=0 option nominal_bitrate=1000000
+	input can/can_fd/arbitrary_traffic/can_fd_std_without_brs_64.sr
+	output can annotation match can_fd_std_without_brs_64.output
+
+test can_fd_ext_without_brs_8
+	protocol-decoder can channel can_rx=0 option nominal_bitrate=1000000
+	input can/can_fd/arbitrary_traffic/can_fd_ext_without_brs_8.sr
+	output can annotation match can_fd_ext_without_brs_8.output
+
+test can_fd_ext_without_brs_64
+	protocol-decoder can channel can_rx=0 option nominal_bitrate=1000000
+	input can/can_fd/arbitrary_traffic/can_fd_ext_without_brs_64.sr
+	output can annotation match can_fd_ext_without_brs_64.output
+
+test can_fd_std_brs_8
+	protocol-decoder can channel can_rx=0 option nominal_bitrate=1000000
+	input can/can_fd/arbitrary_traffic/can_fd_std_brs_8.sr
+	output can annotation match can_fd_std_brs_8.output
+
+test can_fd_std_brs_64
+	protocol-decoder can channel can_rx=0 option nominal_bitrate=1000000
+	input can/can_fd/arbitrary_traffic/can_fd_std_brs_64.sr
+	output can annotation match can_fd_std_brs_64.output
+
+test can_fd_ext_brs_8
+	protocol-decoder can channel can_rx=0 option nominal_bitrate=1000000
+	input can/can_fd/arbitrary_traffic/can_fd_ext_brs_8.sr
+	output can annotation match can_fd_ext_brs_8.output
+
+test can_fd_ext_brs_64
+	protocol-decoder can channel can_rx=0 option nominal_bitrate=1000000
+	input can/can_fd/arbitrary_traffic/can_fd_ext_brs_64.sr
+	output can annotation match can_fd_ext_brs_64.output