Merge branch 'master' into micropeak-logging

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

diff --git a/src/core/ao_telemetry.c b/src/core/ao_telemetry.c
index 4ff98f9be3eeea5dad0f908a01dffa4d90c3915c..8d440e15410ff4bd7833bcd5da6e1380d8ba46f9 100644 (file)
--- a/src/core/ao_telemetry.c
+++ b/src/core/ao_telemetry.c
@@ -299,7 +299,6 @@ ao_telemetry(void)
 #endif
                while (ao_telemetry_interval) {
 
-
 #if HAS_APRS
                        if (!(ao_config.radio_enable & AO_RADIO_DISABLE_TELEMETRY))
 #endif
@@ -343,11 +342,10 @@ ao_telemetry(void)
                                        ao_radio_rdf();
                        }
 #if HAS_APRS
-                       if (ao_rdf &&
-                           (ao_config.radio_enable & AO_RADIO_ENABLE_APRS) &&
+                       if (ao_config.aprs_interval != 0 &&
                            (int16_t) (ao_time() - ao_aprs_time) >= 0)
                        {
-                               ao_aprs_time = ao_time() + AO_APRS_INTERVAL_TICKS;
+                               ao_aprs_time = ao_time() + AO_SEC_TO_TICKS(ao_config.aprs_interval);
                                ao_aprs_send();
                        }
 #endif
@@ -417,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
        }
 }