Skip to content

Commit 500be1f

Browse files
mprsebulislaw
authored andcommitted
Fix tolerance definition in ticker tests.
1 parent e1fc81d commit 500be1f

File tree

2 files changed

+7
-16
lines changed

2 files changed

+7
-16
lines changed

TESTS/mbed_drivers/lp_timer/main.cpp

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,14 @@ extern uint32_t SystemCoreClock;
4646
* 1000 ms delay: tolerance = 50500 us
4747
*
4848
* */
49-
#define DELTA_US(delay_ms) (500 + delay_ms * US_PER_MSEC / 20)
50-
#define DELTA_MS(delay_ms) (1 + (delay_ms * US_PER_MSEC / 20 / US_PER_MSEC))
51-
#define DELTA_S(delay_ms) (0.000500f + (((float)delay_ms) / MSEC_PER_SEC / 20))
5249

5350
#define US_PER_SEC 1000000
5451
#define US_PER_MSEC 1000
55-
#define TOLERANCE_FACTOR 80000.0f
56-
#define US_FACTOR 1000000.0f
57-
#define CLOCK_MAX 130000000
52+
#define MSEC_PER_SEC 1000
5853

59-
static const int delta_sys_clk_us = (SystemCoreClock < CLOCK_MAX? ((int) (TOLERANCE_FACTOR / (float) SystemCoreClock * US_FACTOR)):((int) (TOLERANCE_FACTOR / (float) CLOCK_MAX * US_FACTOR)));
60-
61-
/* When test performs time measurement using Timer in sequence, then measurement error accumulates
62-
* in the successive attempts. */
63-
#define DELTA_US(i) (delta_sys_clk_us * i)
64-
#define DELTA_S(i) ((float)delta_sys_clk_us * i / US_PER_SEC)
65-
#define DELTA_MS(i) (1 + ( (i * delta_sys_clk_us) / US_PER_MSEC))
54+
#define DELTA_US(delay_ms) (500 + (delay_ms) * US_PER_MSEC / 20)
55+
#define DELTA_MS(delay_ms) (1 + ((delay_ms) * US_PER_MSEC / 20 / US_PER_MSEC))
56+
#define DELTA_S(delay_ms) (0.000500f + (((float)(delay_ms)) / MSEC_PER_SEC / 20))
6657

6758
/* This test verifies if low power timer is stopped after
6859
* creation.

TESTS/mbed_drivers/timer/main.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ extern uint32_t SystemCoreClock;
4545
* 1000 ms delay: tolerance = 20500 us
4646
*
4747
* */
48-
#define DELTA_US(delay_ms) (500 + delay_ms * US_PER_MSEC / 50)
49-
#define DELTA_MS(delay_ms) (1 + (delay_ms * US_PER_MSEC / 50 / US_PER_MSEC))
50-
#define DELTA_S(delay_ms) (0.000500f + (((float)delay_ms) / MSEC_PER_SEC / 50))
48+
#define DELTA_US(delay_ms) (500 + (delay_ms) * US_PER_MSEC / 50)
49+
#define DELTA_MS(delay_ms) (1 + ((delay_ms) * US_PER_MSEC / 50 / US_PER_MSEC))
50+
#define DELTA_S(delay_ms) (0.000500f + (((float)(delay_ms)) / MSEC_PER_SEC / 50))
5151

5252
#define TICKER_FREQ_1MHZ 1000000
5353
#define TICKER_BITS 32

0 commit comments

Comments
 (0)