releasing 1.0.3

[fw/altos] / src / ao_telemetry.c

diff --git a/src/ao_telemetry.c b/src/ao_telemetry.c
index 15ba4302b3fb28b1eb707c68b707d2ba5ba37758..0622cbd7386416866f10b127ed97398e86dc7693 100644 (file)
--- a/src/ao_telemetry.c
+++ b/src/ao_telemetry.c
@@ -35,7 +35,7 @@ static __pdata uint16_t ao_rdf_time;
 #define AO_RDF_INTERVAL_TICKS  AO_SEC_TO_TICKS(5)
 #define AO_RDF_LENGTH_MS       500
 
-#if defined(TELEMETRUM_V_0_1) || defined(TELEMETRUM_V_0_2) || defined(TELEMETRUM_V_1_0) || defined(TELEMETRUM_V_1_1)
+#if defined(TELEMETRUM_V_0_1) || defined(TELEMETRUM_V_0_2) || defined(TELEMETRUM_V_1_0) || defined(TELEMETRUM_V_1_1) || defined(TELEMETRUM_V_1_2)
 #define AO_TELEMETRY_SENSOR    AO_TELEMETRY_SENSOR_TELEMETRUM
 #endif
 
@@ -101,7 +101,7 @@ ao_send_configuration(void)
        {
                telemetry.generic.type = AO_TELEMETRY_CONFIGURATION;
                telemetry.configuration.device = AO_idProduct_NUMBER;
-               telemetry.configuration.flight = ao_flight_number;
+               telemetry.configuration.flight = ao_log_full() ? 0 : ao_flight_number;
                telemetry.configuration.config_major = AO_CONFIG_MAJOR;
                telemetry.configuration.config_minor = AO_CONFIG_MINOR;
                telemetry.configuration.apogee_delay = ao_config.apogee_delay;
@@ -180,6 +180,8 @@ ao_telemetry(void)
        int16_t         delay;
 
        ao_config_get();
+       if (!ao_config.radio_enable)
+               ao_exit();
        while (!ao_flight_number)
                ao_sleep(&ao_flight_number);