From f2cabadf600db055c90e714ce7266c4661989250 Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Fri, 14 Aug 2015 22:28:28 -0700 Subject: [PATCH] Review application initialization order. Group related things together. --- firmware/application/main.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/firmware/application/main.cpp b/firmware/application/main.cpp index 8b695e7e1..523c30f6e 100755 --- a/firmware/application/main.cpp +++ b/firmware/application/main.cpp @@ -230,20 +230,13 @@ int main(void) { chSysHalt(); } - init_message_queues(); - portapack::io.init(); portapack::display.init(); sdcStart(&SDCD1, nullptr); - rtc_interrupt_enable(); - - controls_init(); - - lcd_frame_sync_configure(); - - events_initialize(chThdSelf()); + events_initialize(chThdSelf()); + init_message_queues(); ui::Context context; ui::SystemView system_view { @@ -253,10 +246,13 @@ int main(void) { ui::Painter painter; EventDispatcher event_dispatcher { &system_view, painter, context }; - m4txevent_interrupt_enable(); - m4_init(portapack::spi_flash::baseband, portapack::spi_flash::m4_text_ram_base); + controls_init(); + lcd_frame_sync_configure(); + rtc_interrupt_enable(); + m4txevent_interrupt_enable(); + event_dispatcher.run(); return 0;