X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fmegametrum-v0.1%2Fao_megametrum.c;h=a2ac186b617bebd0cc9a1cbf306870a84928d9da;hb=03dc80d15a2f8fe9d7340351226dadd8bc3cfdb9;hp=8283f5332372476f60c608be16c52cf524b744ea;hpb=7b0b6bcc40891d8dd106d091d3af8107b2941c66;p=fw%2Faltos

diff --git a/src/megametrum-v0.1/ao_megametrum.c b/src/megametrum-v0.1/ao_megametrum.c
index 8283f533..a2ac186b 100644
--- a/src/megametrum-v0.1/ao_megametrum.c
+++ b/src/megametrum-v0.1/ao_megametrum.c
@@ -17,23 +17,10 @@
 
 #include <ao.h>
 #include <ao_hmc5883.h>
+#include <ao_mpu6000.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 },
-};
-
 int
 main(void)
 {
@@ -45,7 +32,6 @@ main(void)
 	ao_timer_init();
 	ao_cmd_init();
 	ao_gps_init();
-	ao_config_init();
 	ao_dma_init();
 	ao_spi_init();
 	ao_ms5607_init();
@@ -58,8 +44,12 @@ main(void)
 	ao_i2c_init();
 	ao_hmc5883_init();
 	ao_mpu6000_init();
+//	ao_flight_init();
+//	ao_log_init();
+//	ao_report_init();
+	ao_telemetry_init();
+	ao_config_init();
 	
-	ao_cmd_register(&ao_mm_cmds[0]);
 	ao_start_scheduler();
 	return 0;
 }