Skip to content

Commit 7b42f40

Browse files
henrikbrixandersenMaureenHelm
authored andcommitted
tests: drivers: can: timing: respect CONFIG_CAN_SAMPLE_POINT_MARGIN
Respect the newly introduced CONFIG_CAN_SAMPLE_POINT_MARGIN Kconfig option when verifying if timing can be met. Signed-off-by: Henrik Brix Andersen <[email protected]>
1 parent 63c13b7 commit 7b42f40

File tree

1 file changed

+5
-9
lines changed
  • tests/drivers/can/timing/src

1 file changed

+5
-9
lines changed

tests/drivers/can/timing/src/main.c

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@
1616
* @}
1717
*/
1818

19-
/**
20-
* @brief Allowed sample point calculation margin in permille.
21-
*/
22-
#define SAMPLE_POINT_MARGIN 50
23-
2419
/**
2520
* @brief Defines a set of CAN timing test values
2621
*/
@@ -176,16 +171,16 @@ static bool test_timing_values(const struct device *dev, const struct can_timing
176171
return false;
177172
} else {
178173
zassert_true(sp_err >= 0, "unknown error %d", sp_err);
179-
zassert_true(sp_err <= SAMPLE_POINT_MARGIN, "sample point error %d too large",
180-
sp_err);
174+
zassert_true(sp_err <= CONFIG_CAN_SAMPLE_POINT_MARGIN,
175+
"sample point error %d too large", sp_err);
181176

182177
printk("sjw = %u, prop_seg = %u, phase_seg1 = %u, phase_seg2 = %u, prescaler = %u ",
183178
timing.sjw, timing.prop_seg, timing.phase_seg1, timing.phase_seg2,
184179
timing.prescaler);
185180

186181
assert_bitrate_correct(dev, &timing, test->bitrate);
187182
assert_timing_within_bounds(&timing, min, max);
188-
assert_sp_within_margin(&timing, test->sp, SAMPLE_POINT_MARGIN);
183+
assert_sp_within_margin(&timing, test->sp, CONFIG_CAN_SAMPLE_POINT_MARGIN);
189184

190185
if (IS_ENABLED(CONFIG_CAN_FD_MODE) && data_phase) {
191186
err = can_set_timing_data(dev, &timing);
@@ -257,7 +252,8 @@ void *can_timing_setup(void)
257252
err = can_get_core_clock(dev, &core_clock);
258253
zassert_equal(err, 0, "failed to get core CAN clock");
259254

260-
printk("testing on device %s @ %u Hz\n", dev->name, core_clock);
255+
printk("testing on device %s @ %u Hz, sample point margin +/-%u permille\n", dev->name,
256+
core_clock, CONFIG_CAN_SAMPLE_POINT_MARGIN);
261257

262258
if (IS_ENABLED(CONFIG_CAN_FD_MODE)) {
263259
can_mode_t cap;

0 commit comments

Comments
 (0)