Merge branch 'master' into micropeak-logging

[fw/altos] / src / megametrum-v0.1 / ao_megametrum.c

diff --git a/src/megametrum-v0.1/ao_megametrum.c b/src/megametrum-v0.1/ao_megametrum.c
index 55324514cb062d3b0eba7720279dda4ea7917e20..fbdab64a8766dbbc8a43d21a8e417da4d93691d1 100644 (file)
--- a/src/megametrum-v0.1/ao_megametrum.c
+++ b/src/megametrum-v0.1/ao_megametrum.c
@@ -18,18 +18,30 @@
 #include <ao.h>
 #include <ao_hmc5883.h>
 #include <ao_mpu6000.h>
+#include <ao_mma655x.h>
 #include <ao_log.h>
 #include <ao_exti.h>
 #include <ao_packet.h>
 #include <ao_companion.h>
 #include <ao_profile.h>
+#if HAS_SAMPLE_PROFILE
+#include <ao_sample_profile.h>
+#endif
 #include <ao_pyro.h>
+#if HAS_STACK_GUARD
+#include <ao_mpu.h>
+#endif
 
 int
 main(void)
 {
        ao_clock_init();
        
+#if HAS_STACK_GUARD
+       ao_mpu_init();
+#endif
+
+       ao_task_init();
        ao_serial_init();
        ao_led_init(LEDS_AVAILABLE);
        ao_led_on(AO_LED_GREEN);
@@ -41,7 +53,9 @@ main(void)
        ao_exti_init();
 
        ao_adc_init();
+#if HAS_BEEP
        ao_beep_init();
+#endif
        ao_cmd_init();
 
 #if HAS_MS5607
@@ -53,6 +67,9 @@ main(void)
 #if HAS_MPU6000
        ao_mpu6000_init();
 #endif
+#if HAS_MMA655X
+       ao_mma655x_init();
+#endif
 
        ao_storage_init();
        
@@ -74,6 +91,9 @@ main(void)
 #if AO_PROFILE
        ao_profile_init();
 #endif
+#if HAS_SAMPLE_PROFILE
+       ao_sample_profile_init();
+#endif
        
        ao_start_scheduler();
        return 0;