summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2012-06-15 22:26:06 -0700
committerKeith Packard <keithp@keithp.com>2012-06-15 22:26:06 -0700
commita5a7df405c242593cbc828d5b66bbfc141a35947 (patch)
treefab5eed6fe945b26d8410c2f7271769aefcf38a0
parentbaf1be1def01266512e67068948bf19b04ead6aa (diff)
Temporarily disable packet and telem on MM
While work on the radio code progresses Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--src/core/ao_flight_mm.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/ao_flight_mm.c b/src/core/ao_flight_mm.c
index 2bc5c36a..c2a7cd64 100644
--- a/src/core/ao_flight_mm.c
+++ b/src/core/ao_flight_mm.c
@@ -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);