altos: remove stale ao_flight.c and ao_sample.c

[fw/altos] / src / core / ao_flight_mm.c

diff --git a/src/core/ao_flight_mm.c b/src/core/ao_flight_mm.c
index 2bc5c36a91b3146ab5a9499bb62a06e6e17aa366..a0affc4868f028dd61ccea1b86c0ac863e404623 100644 (file)
--- a/src/core/ao_flight_mm.c
+++ b/src/core/ao_flight_mm.c
@@ -32,6 +32,10 @@
 #error Please define HAS_USB
 #endif
 
+#ifndef HAS_TELEMETRY
+#define HAS_TELEMETRY  HAS_RADIO
+#endif
+
 /* Main flight thread. */
 
 __pdata enum ao_flight_state   ao_flight_state;        /* current flight state */
@@ -94,7 +98,7 @@ ao_flight(void)
                                 */
                                ao_flight_state = ao_flight_invalid;
 
-#if HAS_RADIO
+#if HAS_RADIO && PACKET_HAS_SLAVE
                                /* Turn on packet system in invalid mode on TeleMetrum */
                                ao_packet_slave_start();
 #endif
@@ -120,7 +124,7 @@ ao_flight(void)
                                ao_packet_slave_stop();
 #endif
 
-#if HAS_RADIO
+#if HAS_TELEMETRY
                                /* Turn on telemetry system */
                                ao_rdf_set(1);
                                ao_telemetry_set_interval(AO_TELEMETRY_INTERVAL_PAD);
@@ -131,7 +135,7 @@ ao_flight(void)
                                /* Set idle mode */
                                ao_flight_state = ao_flight_idle;
  
-#if HAS_ACCEL && HAS_RADIO
+#if HAS_ACCEL && HAS_RADIO && PACKET_HAS_SLAVE
                                /* Turn on packet system in idle mode on TeleMetrum */
                                ao_packet_slave_start();
 #endif
@@ -171,7 +175,7 @@ ao_flight(void)
                                /* start logging data */
                                ao_log_start();
 
-#if HAS_RADIO
+#if HAS_TELEMETRY
                                /* Increase telemetry rate */
                                ao_telemetry_set_interval(AO_TELEMETRY_INTERVAL_FLIGHT);
 
@@ -259,7 +263,7 @@ ao_flight(void)
                                ao_ignite(ao_igniter_drogue);
 #endif
 
-#if HAS_RADIO
+#if HAS_TELEMETRY
                                /* slow down the telemetry system */
                                ao_telemetry_set_interval(AO_TELEMETRY_INTERVAL_RECOVER);