diff options
| author | Stephane D'Alu <sdalu@sdalu.com> | 2016-02-06 15:16:48 +0100 |
|---|---|---|
| committer | Stephane D'Alu <sdalu@sdalu.com> | 2016-02-06 15:16:48 +0100 |
| commit | ed35ba38183776a0864e094c78660414c26c93a9 (patch) | |
| tree | 92c7e56ddb7da2a498e90373fe9227adb6280495 /os/hal | |
| parent | bc3392813c17492dc848fff798283a677cf5b495 (diff) | |
| download | ChibiOS-Contrib-ed35ba38183776a0864e094c78660414c26c93a9.tar.gz ChibiOS-Contrib-ed35ba38183776a0864e094c78660414c26c93a9.tar.bz2 ChibiOS-Contrib-ed35ba38183776a0864e094c78660414c26c93a9.zip | |
exclude TIMER0 from GPT if already used for system ticks
Diffstat (limited to 'os/hal')
| -rw-r--r-- | os/hal/ports/NRF51/NRF51822/gpt_lld.h | 7 |
1 files changed, 6 insertions, 1 deletions
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
|