Eliminate RDF tone generation.

[fw/altos] / ao_telemetry.c

diff --git a/ao_telemetry.c b/ao_telemetry.c
index 5cf9ca6134c3bfcc4de4e4cb3f9a7180f1a36a18..463bcd91137f571dde8590b1ecd0523f10e44dc4 100644 (file)
--- a/ao_telemetry.c
+++ b/ao_telemetry.c
@@ -18,10 +18,6 @@
 #include "ao.h"
 
 __xdata uint16_t ao_telemetry_interval = 0;
 #include "ao.h"
 
 __xdata uint16_t ao_telemetry_interval = 0;

-__xdata uint8_t ao_rdf = 0;
-__xdata uint16_t ao_rdf_time;
-
-#define AO_RDF_INTERVAL        AO_SEC_TO_TICKS(3)

 
 void
 ao_telemetry(void)
 
 void
 ao_telemetry(void)


@@ -31,7 +27,6 @@ ao_telemetry(void)
        ao_config_get();
        memcpy(telemetry.callsign, ao_config.callsign, AO_MAX_CALLSIGN);
        telemetry.addr = ao_serial_number;
        ao_config_get();
        memcpy(telemetry.callsign, ao_config.callsign, AO_MAX_CALLSIGN);
        telemetry.addr = ao_serial_number;

-       ao_rdf_time = ao_time();

        for (;;) {
                while (ao_telemetry_interval == 0)
                        ao_sleep(&ao_telemetry_interval);
        for (;;) {
                while (ao_telemetry_interval == 0)
                        ao_sleep(&ao_telemetry_interval);


@@ -47,13 +42,6 @@ ao_telemetry(void)
                ao_mutex_put(&ao_gps_mutex);
                ao_radio_send(&telemetry);
                ao_delay(ao_telemetry_interval);
                ao_mutex_put(&ao_gps_mutex);
                ao_radio_send(&telemetry);
                ao_delay(ao_telemetry_interval);

-               if (ao_rdf &&
-                   (int16_t) (ao_time() - ao_rdf_time) >= 0)
-               {
-                       ao_rdf_time = ao_time() + AO_RDF_INTERVAL;
-                       ao_radio_rdf();
-                       ao_delay(ao_telemetry_interval);
-               }

        }
 }
 
        }
 }
 


@@ -64,14 +52,6 @@ ao_telemetry_set_interval(uint16_t interval)
        ao_wakeup(&ao_telemetry_interval);
 }
 
        ao_wakeup(&ao_telemetry_interval);
 }
 

-void
-ao_rdf_set(uint8_t rdf)
-{
-       ao_rdf = rdf;
-       if (rdf == 0)
-               ao_radio_rdf_abort();
-}
-

 __xdata struct ao_task ao_telemetry_task;
 
 void
 __xdata struct ao_task ao_telemetry_task;
 
 void