summaryrefslogtreecommitdiffstats
path: root/app/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'app/main.c')
-rw-r--r--app/main.c24
1 files changed, 8 insertions, 16 deletions
diff --git a/app/main.c b/app/main.c
index d1c9b27..4f8f6f7 100644
--- a/app/main.c
+++ b/app/main.c
@@ -1,6 +1,9 @@
#include "project.h"
+
extern uint32_t dfu_flag;
+
+
int
main (void)
{
@@ -11,7 +14,7 @@ main (void)
rcc_clock_setup_in_hse_8mhz_out_48mhz ();
- /*turn on clocks to periferals */
+ /*turn on clocks to peripherals */
rcc_periph_clock_enable (RCC_GPIOA);
rcc_periph_clock_enable (RCC_GPIOB);
rcc_periph_clock_enable (RCC_GPIOC);
@@ -19,27 +22,16 @@ main (void)
ticker_init ();
led_init ();
+#ifndef SLIM
i2c_bb_init ();
lcd_init ();
- keypad_init ();
-
-
-
-#if 0
- {
- char buf[16];
- sprintf (buf, "%x", dfu_flag);
- lcd_write (buf, 0, 1);
- }
#endif
- lcd_write ("Booting...", 0, 0);
-
-
+ adc_init ();
+ key_init ();
+ state_init ();
usb_init ();
- code_display();
-
usb_run ();
return 0;