Merge remote-tracking branch 'mjb/master'

[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 ed35efa4028c929c30d898386c30ef7056da200b..d3ae4690c41de2e85c9ea4b402fb35cc8e009d48 100644 (file)
--- a/src/megametrum-v0.1/ao_megametrum.c
+++ b/src/megametrum-v0.1/ao_megametrum.c
@@ -18,11 +18,13 @@
 #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>
+#include <ao_pyro.h>
 
 int
 main(void)
@@ -43,9 +45,18 @@ main(void)
        ao_beep_init();
        ao_cmd_init();
 
+#if HAS_MS5607
        ao_ms5607_init();
+#endif
+#if HAS_HMC5883
        ao_hmc5883_init();
+#endif
+#if HAS_MPU6000
        ao_mpu6000_init();
+#endif
+#if HAS_MMA655X
+       ao_mma655x_init();
+#endif
 
        ao_storage_init();
        
@@ -61,8 +72,12 @@ main(void)
        ao_packet_slave_init(FALSE);
        ao_igniter_init();
        ao_companion_init();
+       ao_pyro_init();
 
        ao_config_init();
+#if AO_PROFILE
+       ao_profile_init();
+#endif
        
        ao_start_scheduler();
        return 0;