diff options
author | root <root@lamia.panaceas.james.local> | 2015-06-07 02:35:01 +0100 |
---|---|---|
committer | root <root@lamia.panaceas.james.local> | 2015-06-07 02:35:01 +0100 |
commit | cdea4f5da56c6158beccc801f0a4efa045cf46cb (patch) | |
tree | 456a1677aff4cd0f08a9461d72659ec20b4e0c8b /app/tims_keyboard.c | |
parent | 7fa21387755e96ea0403ff4213af8a053811b81d (diff) | |
download | tims_keyboard-cdea4f5da56c6158beccc801f0a4efa045cf46cb.tar.gz tims_keyboard-cdea4f5da56c6158beccc801f0a4efa045cf46cb.tar.bz2 tims_keyboard-cdea4f5da56c6158beccc801f0a4efa045cf46cb.zip |
tidy up makefiles and fix init delay
Diffstat (limited to 'app/tims_keyboard.c')
-rw-r--r-- | app/tims_keyboard.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/app/tims_keyboard.c b/app/tims_keyboard.c index c3c947b..4897c4d 100644 --- a/app/tims_keyboard.c +++ b/app/tims_keyboard.c @@ -27,19 +27,33 @@ main (void) nvic_set_priority (NVIC_EXTI0_IRQ, 0xc0); usart_init (); - ticker_init (); #ifdef DEBUG - printf ("Hello world!\r\n"); + printf ("USART and ticker started\r\n"); +#endif + + usb_init (); + +#ifdef DEBUG + printf ("USB started\r\n"); #endif atkbd_init (); - usb_init (); +#ifdef DEBUG + printf ("ATKBD i/f started\r\n"); +#endif + while (ticks < AT_KBD_INIT_TIME) + usb_poll (); - usb_run (); + atkbd_start (); +#ifdef DEBUG + printf ("Keyboard started\r\n"); +#endif + + usb_run (); return 0; } |