From d3c26e534d8df34cfbf29b70cd1b2692493ce150 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 4 Jul 2011 18:03:51 -0700 Subject: [PATCH] altos: teledongle does not need ao_packet_slave.c TeleDongle doesn't provide slave interfaces, so remove ao_packet_slave from the TD build Signed-off-by: Keith Packard --- src/Makefile.proto | 10 ++++++---- src/ao_radio.c | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Makefile.proto b/src/Makefile.proto index bc7b3a7f..5322df17 100644 --- a/src/Makefile.proto +++ b/src/Makefile.proto @@ -62,9 +62,7 @@ USB_DRIVER_SRC = \ ao_usb.c TELE_COMMON_SRC = \ - ao_packet.c \ - ao_packet_slave.c \ - ao_state.c + ao_packet.c # # Receiver code @@ -73,6 +71,7 @@ TELE_RECEIVER_SRC =\ ao_monitor.c \ ao_gps_print.c \ ao_packet_master.c \ + ao_state.c \ ao_rssi.c # @@ -107,6 +106,7 @@ TM_DRIVER_SRC = \ ao_adc.c \ ao_gps_report.c \ ao_ignite.c \ + ao_packet_slave.c \ $(BEEP_DRIVER_SRC) \ $(USB_DRIVER_SRC) @@ -160,7 +160,7 @@ TM_TASK_SRC = \ ao_log.c \ ao_log_big.c \ ao_report.c \ - ao_telemetry_orig.c + ao_telemetry.c TM_MAIN_SRC = \ ao_telemetrum.c @@ -185,6 +185,7 @@ TMINI_DRIVER_SRC = \ ao_ignite.c \ ao_config.c \ ao_storage.c \ + ao_packet_slave.c \ ao_intflash.c TMINI_TASK_SRC = \ @@ -214,6 +215,7 @@ TNANO_DRIVER_SRC = \ ao_adc.c \ ao_config.c \ ao_storage.c \ + ao_packet_slave.c \ ao_intflash.c TNANO_TASK_SRC = \ diff --git a/src/ao_radio.c b/src/ao_radio.c index 01974ba1..4c382bb9 100644 --- a/src/ao_radio.c +++ b/src/ao_radio.c @@ -433,7 +433,9 @@ ao_radio_test(void) mode++; if ((mode & 2) && !radio_on) { ao_set_monitor(0); +#if PACKET_HAS_SLAVE ao_packet_slave_stop(); +#endif ao_radio_get(0xff); RFST = RFST_STX; radio_on = 1; -- 2.30.2