1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00

Merge pull request #20096 from maribu/tests/periph/selftest_shield

tests/periph/selftest_shield: timer allocation conflict
This commit is contained in:
Marian Buschsieweke 2023-11-21 05:03:31 +00:00 committed by GitHub
commit 4232fea164
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -126,7 +126,17 @@
# define UART_TEST_DEV UART_DEV(0)
#endif
#ifndef TIMER
# define TIMER TIMER_DEV(0)
# if IS_USED(MODULE_ZTIMER_PERIPH_TIMER) && CONFIG_ZTIMER_USEC_DEV == TIMER_DEV(0)
# define TIMER TIMER_DEV(1)
# else
# define TIMER TIMER_DEV(0)
# endif
#endif
#if IS_USED(MODULE_ZTIMER_PERIPH_TIMER)
# if CONFIG_ZTIMER_USEC_DEV == TIMER
# error "Same timer used for ztimer and test"
# endif
#endif
/* A higher clock frequency is beneficial in being able to actually measure the