X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcore%2Fao_telemetry.c;h=03a8a273c9d24eaea09d90ba6de9853a7012e6c9;hb=4babe7310f78338ca36ab9d31ac833eada27485f;hp=c3bbfec5aa7d40468f903ab53919985979020636;hpb=b7b0ddfddee3f8e21f21d67cd9f522fa50777265;p=fw%2Faltos

diff --git a/src/core/ao_telemetry.c b/src/core/ao_telemetry.c
index c3bbfec5..03a8a273 100644
--- a/src/core/ao_telemetry.c
+++ b/src/core/ao_telemetry.c
@@ -19,9 +19,16 @@
 #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;
@@ -198,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;
@@ -295,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
@@ -328,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) &&
@@ -345,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)
@@ -411,6 +427,7 @@ ao_telemetry_set_interval(uint16_t interval)
 	ao_wakeup(&telemetry);
 }
 
+#if HAS_RDF
 void
 ao_rdf_set(uint8_t rdf)
 {
@@ -421,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;