X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_telemetry.c;h=fa8178240e45b97f60c71717eb77d76fd3e3e69c;hb=992eee8e0b4c6c774f3355af107fb422019ff4e5;hp=e70791792d5644c30ab5745ee2d8a7966648beda;hpb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;p=fw%2Faltos

diff --git a/src/kernel/ao_telemetry.c b/src/kernel/ao_telemetry.c
index e7079179..fa817824 100644
--- a/src/kernel/ao_telemetry.c
+++ b/src/kernel/ao_telemetry.c
@@ -270,7 +270,7 @@ ao_send_mini(void)
 	__xdata	struct ao_data *packet = (__xdata struct ao_data *) &ao_data_ring[ao_data_ring_prev(ao_sample_data)];
 
 	telemetry.generic.tick = packet->tick;
-	telemetry.generic.type = AO_TELEMETRY_MINI;
+	telemetry.generic.type = AO_SEND_MINI;
 
 	telemetry.mini.state = ao_flight_state;
 
@@ -294,6 +294,7 @@ ao_send_mini(void)
 
 static __pdata int8_t ao_telemetry_config_max;
 static __pdata int8_t ao_telemetry_config_cur;
+static __pdata uint16_t ao_telemetry_flight_number;
 
 static void
 ao_send_configuration(void)
@@ -302,11 +303,7 @@ ao_send_configuration(void)
 	{
 		telemetry.generic.type = AO_TELEMETRY_CONFIGURATION;
 		telemetry.configuration.device = AO_idProduct_NUMBER;
-#if HAS_LOG
-		telemetry.configuration.flight = ao_log_full() ? 0 : ao_flight_number;
-#else
-		telemetry.configuration.flight = ao_flight_number;
-#endif
+		telemetry.configuration.flight = ao_telemetry_flight_number;
 		telemetry.configuration.config_major = AO_CONFIG_MAJOR;
 		telemetry.configuration.config_minor = AO_CONFIG_MINOR;
 #if AO_idProduct_NUMBER == 0x25 && HAS_ADC
@@ -406,6 +403,11 @@ ao_telemetry(void)
 	while (!ao_flight_number)
 		ao_sleep(&ao_flight_number);
 
+	ao_telemetry_flight_number = ao_flight_number;
+#if HAS_LOG
+	if (ao_log_full())
+		ao_telemetry_flight_number = 0;
+#endif
 	telemetry.generic.serial = ao_serial_number;
 	for (;;) {
 		while (ao_telemetry_interval == 0)