altos: Send APRS packets even during ascent
authorKeith Packard <keithp@keithp.com>
Thu, 6 Dec 2012 18:30:46 +0000 (10:30 -0800)
committerKeith Packard <keithp@keithp.com>
Thu, 6 Dec 2012 18:30:46 +0000 (10:30 -0800)
If you're using APRS, presumably you want to watch the rocket going up too.

Signed-off-by: Keith Packard <keithp@keithp.com>
src/core/ao_telemetry.c

index 4ff98f9be3eeea5dad0f908a01dffa4d90c3915c..cfc72e048fe4b3c19f4c71fd41184be2dc110dcc 100644 (file)
@@ -343,8 +343,7 @@ ao_telemetry(void)
                                        ao_radio_rdf();
                        }
 #if HAS_APRS
-                       if (ao_rdf &&
-                           (ao_config.radio_enable & AO_RADIO_ENABLE_APRS) &&
+                       if ((ao_config.radio_enable & AO_RADIO_ENABLE_APRS) &&
                            (int16_t) (ao_time() - ao_aprs_time) >= 0)
                        {
                                ao_aprs_time = ao_time() + AO_APRS_INTERVAL_TICKS;
@@ -417,9 +416,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
        }
 }