Temporarily disable packet and telem on MM
authorKeith Packard <keithp@keithp.com>
Sat, 16 Jun 2012 05:26:06 +0000 (22:26 -0700)
committerKeith Packard <keithp@keithp.com>
Sat, 16 Jun 2012 05:26:06 +0000 (22:26 -0700)
While work on the radio code progresses

Signed-off-by: Keith Packard <keithp@keithp.com>
src/core/ao_flight_mm.c

index 2bc5c36a91b3146ab5a9499bb62a06e6e17aa366..c2a7cd6484adb5bc2a36fe3fa386ca891ca5cc6c 100644 (file)
@@ -94,7 +94,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 +120,7 @@ ao_flight(void)
                                ao_packet_slave_stop();
 #endif
 
-#if HAS_RADIO
+#if HAS_RADIO && !defined (MEGAMETRUM)
                                /* Turn on telemetry system */
                                ao_rdf_set(1);
                                ao_telemetry_set_interval(AO_TELEMETRY_INTERVAL_PAD);
@@ -131,7 +131,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 +171,7 @@ ao_flight(void)
                                /* start logging data */
                                ao_log_start();
 
-#if HAS_RADIO
+#if HAS_RADIO && !defined(MEGAMETRUM)
                                /* Increase telemetry rate */
                                ao_telemetry_set_interval(AO_TELEMETRY_INTERVAL_FLIGHT);
 
@@ -259,7 +259,7 @@ ao_flight(void)
                                ao_ignite(ao_igniter_drogue);
 #endif
 
-#if HAS_RADIO
+#if HAS_RADIO && !defined(MEGAMETRUM)
                                /* slow down the telemetry system */
                                ao_telemetry_set_interval(AO_TELEMETRY_INTERVAL_RECOVER);