summaryrefslogtreecommitdiffstats
path: root/app/tims_keyboard.c
diff options
context:
space:
mode:
authorroot <root@lamia.panaceas.james.local>2015-06-06 16:00:52 +0100
committerroot <root@lamia.panaceas.james.local>2015-06-06 16:00:52 +0100
commit808e3dc9de1fb26eed6efcfe5665f0a66c239970 (patch)
treeb71ef5c7af6a735198472e305c055667b2373fd7 /app/tims_keyboard.c
parent98cba32ca9d62f6e4b7e735d177dba699b8d0698 (diff)
downloadtims_keyboard-808e3dc9de1fb26eed6efcfe5665f0a66c239970.tar.gz
tims_keyboard-808e3dc9de1fb26eed6efcfe5665f0a66c239970.tar.bz2
tims_keyboard-808e3dc9de1fb26eed6efcfe5665f0a66c239970.zip
fish
Diffstat (limited to 'app/tims_keyboard.c')
-rw-r--r--app/tims_keyboard.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/tims_keyboard.c b/app/tims_keyboard.c
index e6a4aae..ec1ce59 100644
--- a/app/tims_keyboard.c
+++ b/app/tims_keyboard.c
@@ -21,10 +21,10 @@ main (void)
rcc_periph_clock_enable (RCC_USART1);
dwt_enable_cycle_counter();
- /*Change interrupt priorities so that USART trumps everything else */
+ /*Change interrupt priorities so that USART trumps Timer trumps ATKBD */
nvic_set_priority(NVIC_USART1_IRQ, 0x40);
- nvic_set_priority(NVIC_EXTI0_IRQ, 0xff);
- nvic_set_priority(NVIC_SYSTICK_IRQ, 0xff);
+ nvic_set_priority(NVIC_SYSTICK_IRQ, 0x80);
+ nvic_set_priority(NVIC_EXTI0_IRQ, 0xc0);
usart_init();