From ed35ba38183776a0864e094c78660414c26c93a9 Mon Sep 17 00:00:00 2001 From: Stephane D'Alu Date: Sat, 6 Feb 2016 15:16:48 +0100 Subject: exclude TIMER0 from GPT if already used for system ticks --- os/hal/ports/NRF51/NRF51822/gpt_lld.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'os/hal/ports/NRF51/NRF51822') diff --git a/os/hal/ports/NRF51/NRF51822/gpt_lld.h b/os/hal/ports/NRF51/NRF51822/gpt_lld.h index d707cda..0e3b544 100644 --- a/os/hal/ports/NRF51/NRF51822/gpt_lld.h +++ b/os/hal/ports/NRF51/NRF51822/gpt_lld.h @@ -94,7 +94,12 @@ #if !NRF51_GPT_USE_TIMER0 && !NRF51_GPT_USE_TIMER1 && \ !NRF51_GPT_USE_TIMER2 -#error "GPT driver activated but no TIM peripheral assigned" +#error "GPT driver activated but no TIMER peripheral assigned" +#endif + +#if (NRF51_GPT_USE_TIMER0 == TRUE) && \ + (NRF51_SYSTEM_TICKS == NRF51_SYSTEM_TICKS_AS_TIMER) +#error "GPT driver can't use TIMER0 as currently used by ST driver" #endif #if 0 -- cgit v1.2.3