altos: Enable full flight computer functionality in MegaMetrum

This turns on everything that currently works

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/megametrum-v0.1/Makefile b/src/megametrum-v0.1/Makefile
index 22a58ff445de4d512cf224eee08f594509606118..07a339b9702ed66fbcf938dbc9a496c4db608f9c 100644 (file)
--- a/src/megametrum-v0.1/Makefile
+++ b/src/megametrum-v0.1/Makefile
@@ -19,6 +19,7 @@ INC = \
        ao_hmc5883.h \
        ao_mpu6000.h \
        ao_cc1120_CC1120.h \
+       ao_profile.h \
        ao_whiten.h \
        stm32l.h
 
@@ -43,6 +44,8 @@ ALTOS_SRC = \
        ao_mutex.c \
        ao_serial_stm.c \
        ao_gps_skytraq.c \
+       ao_gps_report_mega.c \
+       ao_ignite.c \
        ao_freq.c \
        ao_dma_stm.c \
        ao_spi_stm.c \
@@ -66,7 +69,10 @@ ALTOS_SRC = \
        ao_sample_mm.c \
        ao_kalman.c \
        ao_flight_mm.c \
-       ao_telemetry.c
+       ao_telemetry.c \
+       ao_packet_slave.c \
+       ao_packet.c \
+       ao_companion.c
 
 
 PRODUCT=MegaMetrum-v0.1

diff --git a/src/megametrum-v0.1/ao_megametrum.c b/src/megametrum-v0.1/ao_megametrum.c
index a2ac186b617bebd0cc9a1cbf306870a84928d9da..ed35efa4028c929c30d898386c30ef7056da200b 100644 (file)
--- a/src/megametrum-v0.1/ao_megametrum.c
+++ b/src/megametrum-v0.1/ao_megametrum.c
@@ -20,6 +20,9 @@
 #include <ao_mpu6000.h>
 #include <ao_log.h>
 #include <ao_exti.h>
+#include <ao_packet.h>
+#include <ao_companion.h>
+#include <ao_profile.h>
 
 int
 main(void)
@@ -30,24 +33,35 @@ main(void)
        ao_led_init(LEDS_AVAILABLE);
        ao_led_on(AO_LED_GREEN);
        ao_timer_init();
-       ao_cmd_init();
-       ao_gps_init();
-       ao_dma_init();
+
+       ao_i2c_init();
        ao_spi_init();
-       ao_ms5607_init();
-       ao_beep_init();
-       ao_adc_init();
-       ao_storage_init();
-       ao_usb_init();
+       ao_dma_init();
        ao_exti_init();
-       ao_radio_init();
-       ao_i2c_init();
+
+       ao_adc_init();
+       ao_beep_init();
+       ao_cmd_init();
+
+       ao_ms5607_init();
        ao_hmc5883_init();
        ao_mpu6000_init();
-//     ao_flight_init();
-//     ao_log_init();
-//     ao_report_init();
+
+       ao_storage_init();
+       
+       ao_flight_init();
+       ao_log_init();
+       ao_report_init();
+
+       ao_usb_init();
+       ao_gps_init();
+       ao_gps_report_mega_init();
        ao_telemetry_init();
+       ao_radio_init();
+       ao_packet_slave_init(FALSE);
+       ao_igniter_init();
+       ao_companion_init();
+
        ao_config_init();
        
        ao_start_scheduler();