test: Fixes from regression in rx_err_log_* tests.

Author: ondrej.ille

test/main_tb/feature_tests/rx_err_log_2_ftest.vhd

@@ -164,7 +164,7 @@ package body rx_err_log_2_ftest is
         CAN_wait_pc_state(pc_deb_crc_delim, DUT_NODE, chn);
         wait for 20 ns;
         flip_bus_level(chn);
-        CAN_wait_sample_point(DUT_NODE, chn);
+        CAN_wait_sample_point(DUT_NODE, chn, false);
         wait for 20 ns;
         release_bus_level(chn);
 
@@ -188,7 +188,11 @@ package body rx_err_log_2_ftest is
         check_m(err_frame.erf = '1', "FRAME_FORMAT_W[ERF] = 1");
         check_m(err_frame.ivld = '1', "FRAME_FORMAT_W[IVLD] = 1");
         check_m(err_frame.erf_pos = ERC_POS_ACK, "FRAME_FORMAT_W[ERF_POS] = ERC_POS_ACK");
-        check_m(err_frame.erf_type = ERC_FRM_ERR, "FRAME_FORMAT_W[ERF_TYPE] = ERC_FRM_ERR");
+
+        -- When we manage to flip just the stuff bit due to randomization, it will be stuff error
+        -- not from error!
+        check_m(err_frame.erf_type = ERC_FRM_ERR or err_frame.erf_type = ERC_STUF_ERR,
+                "FRAME_FORMAT_W[ERF_TYPE] = ERC_FRM_ERR or FRAME_FORMAT_W[ERF_TYPE] = ERC_STUF_ERR");
 
         CAN_wait_bus_idle(DUT_NODE, chn);
 

test/main_tb/feature_tests/rx_err_log_3_ftest.vhd

@@ -174,7 +174,7 @@ package body rx_err_log_3_ftest is
 
         flip_bus_level(chn);
 
-        CAN_wait_sample_point(DUT_NODE, chn);
+        CAN_wait_sample_point(DUT_NODE, chn, false);
         wait for 20 ns;
 
         release_bus_level(chn);
@@ -319,7 +319,7 @@ package body rx_err_log_3_ftest is
         wait for 20 ns;
         flip_bus_level(chn);
 
-        CAN_wait_sample_point(DUT_NODE, chn);
+        CAN_wait_sample_point(DUT_NODE, chn, false);
         wait for 20 ns;
 
         release_bus_level(chn);

test/main_tb/feature_tests/rx_err_log_6_ftest.vhd

@@ -174,7 +174,7 @@ package body rx_err_log_6_ftest is
 
         CAN_wait_sync_seg(DUT_NODE, chn);
         flip_bus_level(chn);
-        CAN_wait_sample_point(DUT_NODE, chn);
+        CAN_wait_sample_point(DUT_NODE, chn, false);
         wait for 20 ns;
         release_bus_level(chn);
 

test/main_tb/feature_tests/rx_err_log_7_ftest.vhd

@@ -162,6 +162,9 @@ package body rx_err_log_7_ftest is
         CAN_generate_frame(tx_frame_2);
         tx_frame_2.rtr := NO_RTR_FRAME;
         tx_frame_2.data_length := 8;
+        -- To avoid SSP. If error is detected in SSP, DUT Node does not react immediately, but
+        -- delays until next regular sample point!
+        tx_frame_2.brs := BR_NO_SHIFT;
         decode_length(tx_frame_2.data_length, tx_frame_2.dlc);
 
         CAN_send_frame(tx_frame_2, 1, DUT_NODE, chn, frame_sent);
@@ -175,7 +178,7 @@ package body rx_err_log_7_ftest is
 
         CAN_wait_sync_seg(DUT_NODE, chn);
         flip_bus_level(chn);
-        CAN_wait_sample_point(DUT_NODE, chn);
+        CAN_wait_sample_point(DUT_NODE, chn, false);
         wait for 20 ns;
         release_bus_level(chn);