diff options
Diffstat (limited to 'altimeter.c')
| -rw-r--r-- | altimeter.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/altimeter.c b/altimeter.c index 861b054..db45eb7 100644 --- a/altimeter.c +++ b/altimeter.c @@ -10,6 +10,8 @@ #include "data_manager.h" #include "display.h" +#include "timer.h" +#include "barometer.h" #ifdef WDT_DISABLE # warning "WDT disabled in this build" @@ -47,17 +49,23 @@ ISR(TIMER1_COMPA_vect) int main(void) { + struct barometer barometer; + struct timer timer; + /* Initialise display before enabling interrupts */ display_init(); display_clear(); - data_manager_init(&dctx); - DEBUG_INIT; + /* get descriptors for system default peripherals */ + get_system_barometer(&barometer); + get_system_timer(&timer); + + timer.init(); + barometer.init(); - /* Initialise timers for /1024 prescaler, 1 Hz comparator val */ - TCCR1B |= (1 << CS10) | (1 << CS12) | (1 << WGM12); - TIMSK1 |= (1 << OCIE1A); - OCR1A = F_CPU / 1024; + data_manager_init(&dctx, &timer, &barometer); + + DEBUG_INIT; #ifdef USBCON /* Disable USB controller if one is present - this spams (latches?) USB_GEN |