altos: Allow products to disable RDF entirely

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

diff --git a/src/core/ao_telemetry.c b/src/core/ao_telemetry.c
index 8d440e15410ff4bd7833bcd5da6e1380d8ba46f9..03a8a273c9d24eaea09d90ba6de9853a7012e6c9 100644 (file)
--- a/src/core/ao_telemetry.c
+++ b/src/core/ao_telemetry.c
@@ -16,11 +16,19 @@
  */
 
 #include "ao.h"
+#include "ao_log.h"
 #include "ao_product.h"
 
+#ifndef HAS_RDF
+#define HAS_RDF 1
+#endif
+
 static __pdata uint16_t ao_telemetry_interval;
 static __pdata uint8_t ao_rdf = 0;
+
+#if HAS_RDF
 static __pdata uint16_t ao_rdf_time;
+#endif
 
 #if HAS_APRS
 static __pdata uint16_t ao_aprs_time;
@@ -28,7 +36,7 @@ static __pdata uint16_t ao_aprs_time;
 #include <ao_aprs.h>
 #endif
 
-#if defined(MEGAMETRUM)
+#if defined(TELEMEGA)
 #define AO_SEND_MEGA   1
 #endif
 
@@ -197,7 +205,11 @@ ao_send_configuration(void)
        {
                telemetry.generic.type = AO_TELEMETRY_CONFIGURATION;
                telemetry.configuration.device = AO_idProduct_NUMBER;
+#if HAS_LOG
                telemetry.configuration.flight = ao_log_full() ? 0 : ao_flight_number;
+#else
+               telemetry.configuration.flight = ao_flight_number;
+#endif
                telemetry.configuration.config_major = AO_CONFIG_MAJOR;
                telemetry.configuration.config_minor = AO_CONFIG_MINOR;
                telemetry.configuration.apogee_delay = ao_config.apogee_delay;
@@ -229,6 +241,7 @@ ao_send_location(void)
                ao_xmemcpy(&telemetry.location.flags,
                       &ao_gps_data.flags,
                       26);
+               telemetry.location.tick = ao_gps_tick;
                ao_mutex_put(&ao_gps_mutex);
                ao_radio_send(&telemetry, sizeof (telemetry));
                ao_telemetry_loc_cur = ao_telemetry_config_max;
@@ -293,7 +306,10 @@ ao_telemetry(void)
        for (;;) {
                while (ao_telemetry_interval == 0)
                        ao_sleep(&telemetry);
-               time = ao_rdf_time = ao_time();
+               time = ao_time();
+#if HAS_RDF
+               ao_rdf_time = time;
+#endif
 #if HAS_APRS
                ao_aprs_time = time;
 #endif
@@ -306,12 +322,14 @@ ao_telemetry(void)
 #ifdef AO_SEND_ALL_BARO
                                ao_send_baro();
 #endif
+#if HAS_FLIGHT
 #ifdef AO_SEND_MEGA
                                ao_send_mega_sensor();
                                ao_send_mega_data();
 #else
                                ao_send_sensor();
 #endif
+#endif
 
 #if HAS_COMPANION
                                if (ao_companion_running)
@@ -324,6 +342,7 @@ ao_telemetry(void)
 #endif
                        }
 #ifndef AO_SEND_ALL_BARO
+#if HAS_RDF
                        if (ao_rdf &&
 #if HAS_APRS
                            !(ao_config.radio_enable & AO_RADIO_DISABLE_RDF) &&
@@ -341,6 +360,7 @@ ao_telemetry(void)
 #endif
                                        ao_radio_rdf();
                        }
+#endif /* HAS_RDF */
 #if HAS_APRS
                        if (ao_config.aprs_interval != 0 &&
                            (int16_t) (ao_time() - ao_aprs_time) >= 0)
@@ -407,6 +427,7 @@ ao_telemetry_set_interval(uint16_t interval)
        ao_wakeup(&telemetry);
 }
 
+#if HAS_RDF
 void
 ao_rdf_set(uint8_t rdf)
 {
@@ -417,6 +438,7 @@ ao_rdf_set(uint8_t rdf)
                ao_rdf_time = ao_time() + AO_RDF_INTERVAL_TICKS;
        }
 }
+#endif
 
 __xdata struct ao_task ao_telemetry_task;