X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fcore%2Fao_telemetry.c;h=8d440e15410ff4bd7833bcd5da6e1380d8ba46f9;hp=79d1bb814f7b2ad87da0414bce50fb9841b05177;hb=868ef0c9c4b208c02a87180b0eede329369bdc77;hpb=f661da527fb4a3a492f5322e2a718d441e1cde83

diff --git a/src/core/ao_telemetry.c b/src/core/ao_telemetry.c
index 79d1bb81..8d440e15 100644
--- a/src/core/ao_telemetry.c
+++ b/src/core/ao_telemetry.c
@@ -299,28 +299,35 @@ ao_telemetry(void)
 #endif
 		while (ao_telemetry_interval) {
 
-
+#if HAS_APRS
+			if (!(ao_config.radio_enable & AO_RADIO_DISABLE_TELEMETRY))
+#endif
+			{
 #ifdef AO_SEND_ALL_BARO
-			ao_send_baro();
+				ao_send_baro();
 #endif
 #ifdef AO_SEND_MEGA
-			ao_send_mega_sensor();
-			ao_send_mega_data();
+				ao_send_mega_sensor();
+				ao_send_mega_data();
 #else
-			ao_send_sensor();
+				ao_send_sensor();
 #endif
 
 #if HAS_COMPANION
-			if (ao_companion_running)
-				ao_send_companion();
+				if (ao_companion_running)
+					ao_send_companion();
 #endif
-			ao_send_configuration();
+				ao_send_configuration();
 #if HAS_GPS
-			ao_send_location();
-			ao_send_satellite();
+				ao_send_location();
+				ao_send_satellite();
 #endif
+			}
 #ifndef AO_SEND_ALL_BARO
 			if (ao_rdf &&
+#if HAS_APRS
+			    !(ao_config.radio_enable & AO_RADIO_DISABLE_RDF) &&
+#endif
 			    (int16_t) (ao_time() - ao_rdf_time) >= 0)
 			{
 #if HAS_IGNITE_REPORT
@@ -335,8 +342,10 @@ ao_telemetry(void)
 					ao_radio_rdf();
 			}
 #if HAS_APRS
-			if (ao_rdf && (int16_t) (ao_time() - ao_aprs_time) >= 0) {
-				ao_aprs_time = ao_time() + AO_APRS_INTERVAL_TICKS;
+			if (ao_config.aprs_interval != 0 &&
+			    (int16_t) (ao_time() - ao_aprs_time) >= 0)
+			{
+				ao_aprs_time = ao_time() + AO_SEC_TO_TICKS(ao_config.aprs_interval);
 				ao_aprs_send();
 			}
 #endif
@@ -406,9 +415,6 @@ ao_rdf_set(uint8_t rdf)
 		ao_radio_rdf_abort();
 	else {
 		ao_rdf_time = ao_time() + AO_RDF_INTERVAL_TICKS;
-#if HAS_APRS
-		ao_aprs_time = ao_time() + AO_APRS_INTERVAL_TICKS;
-#endif
 	}
 }