diff options
Diffstat (limited to 'altimeter.c')
| -rw-r--r-- | altimeter.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/altimeter.c b/altimeter.c index 76dabd9..df238da 100644 --- a/altimeter.c +++ b/altimeter.c @@ -11,6 +11,7 @@ #include "data_manager.h" #include "display.h" #include "timer.h" +#include "ui.h" #include "barometer.h" #ifdef WDT_DISABLE @@ -23,35 +24,32 @@ #endif static struct data_ctx dctx = {}; +static struct ui_ctx ui_ctx = {}; /* ISR for collecting and displaying pressure, altitude data etc */ ISR(TIMER1_COMPA_vect) { data_manager_tick(&dctx); - //ui_tick(); - + ui_update(&ui_ctx, &dctx); WDT_PAT_MAYBE(); } int main(void) { - struct display display; struct barometer barometer; + struct display display; struct timer timer; - /* Initialise display before enabling interrupts */ - get_system_display(&display); - display.init(); - display.clear(); - /* get descriptors for system default peripherals */ get_system_barometer(&barometer); + get_system_display(&display); get_system_timer(&timer); - timer.init(); + /* Initialise peripherals/modules before enabling interrupts below */ barometer.init(); - + timer.init(); data_manager_init(&dctx, &timer, &barometer); + ui_init(&ui_ctx, &display); #ifdef USBCON /* Disable USB controller if one is present - this spams (latches?) USB_GEN |