X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fmegametrum-v0.1%2Fao_megametrum.c;h=d3ae4690c41de2e85c9ea4b402fb35cc8e009d48;hp=2e1f92983218a84b87ec0a30469b5d8397f1e5b0;hb=583458772746317b98fced907ec780edff465888;hpb=fad6cda3d081d438b18305611f37fe05335aa372

diff --git a/src/megametrum-v0.1/ao_megametrum.c b/src/megametrum-v0.1/ao_megametrum.c
index 2e1f9298..d3ae4690 100644
--- a/src/megametrum-v0.1/ao_megametrum.c
+++ b/src/megametrum-v0.1/ao_megametrum.c
@@ -18,22 +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>
-
-void
-beep(void)
-{
-	ao_beep(AO_BEEP_MID);
-	printf ("Hit a character to stop..."); flush();
-	getchar();
-	putchar('\n');
-	ao_beep(0);
-}
-
-const struct ao_cmds ao_mm_cmds[] = {
-	{ beep, "b\0Beep" },
-	{ 0, NULL },
-};
+#include <ao_packet.h>
+#include <ao_companion.h>
+#include <ao_profile.h>
+#include <ao_pyro.h>
 
 int
 main(void)
@@ -44,23 +35,50 @@ main(void)
 	ao_led_init(LEDS_AVAILABLE);
 	ao_led_on(AO_LED_GREEN);
 	ao_timer_init();
-	ao_cmd_init();
-	ao_gps_init();
-	ao_config_init();
-	ao_dma_init();
+
+	ao_i2c_init();
 	ao_spi_init();
-	ao_ms5607_init();
-	ao_beep_init();
+	ao_dma_init();
+	ao_exti_init();
+
 	ao_adc_init();
+	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();
+	
+	ao_flight_init();
+	ao_log_init();
+	ao_report_init();
+
 	ao_usb_init();
-	ao_exti_init();
+	ao_gps_init();
+	ao_gps_report_mega_init();
+	ao_telemetry_init();
 	ao_radio_init();
-	ao_i2c_init();
-	ao_hmc5883_init();
-	ao_mpu6000_init();
+	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_cmd_register(&ao_mm_cmds[0]);
 	ao_start_scheduler();
 	return 0;
 }