diff options
| author | Bdale Garbee <bdale@gag.com> | 2011-08-22 16:08:55 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2011-08-22 16:08:55 -0600 |
| commit | a08826292ebd802a1ff2effccac3b96fd061c47d (patch) | |
| tree | 8441ae73a9cf31fefa5b6a0f6a14af579befa8de /src/ao_telemetry.c | |
| parent | 3366cfe6145f64cdb04654854d5390c671a288e3 (diff) | |
| parent | 55be3db2e31fe97e7f351e3c490b8bc4cf7192b2 (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src/ao_telemetry.c')
| -rw-r--r-- | src/ao_telemetry.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ao_telemetry.c b/src/ao_telemetry.c index 15ba4302..c7338a58 100644 --- a/src/ao_telemetry.c +++ b/src/ao_telemetry.c @@ -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); |