X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcore%2Fao_telemetry.c;h=46d726095a35c63b6fbbd6a1ee33fd94645798ca;hb=6a973f788563ccc66b01cc7557a004dabef18d09;hp=e66598d1402a05340a6a3e5f7ec83bf33092e572;hpb=eb61f7aa2c8b692bd892b85e782f249187c80e5c;p=fw%2Faltos

diff --git a/src/core/ao_telemetry.c b/src/core/ao_telemetry.c
index e66598d1..46d72609 100644
--- a/src/core/ao_telemetry.c
+++ b/src/core/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) || defined(TELEBALLOON_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(TELEBALLOON_V_1_1) || defined(TELEMETRUM_V_1_2)
 #define AO_TELEMETRY_SENSOR	AO_TELEMETRY_SENSOR_TELEMETRUM
 #endif
 
@@ -53,8 +53,7 @@ static __xdata union ao_telemetry_all	telemetry;
 static void
 ao_send_sensor(void)
 {
-	uint8_t		sample;
-	sample = ao_sample_adc;
+	uint8_t		sample = ao_adc_ring_prev(ao_sample_adc);
 			
 	telemetry.generic.tick = ao_adc_ring[sample].tick;
 	telemetry.generic.type = AO_TELEMETRY_SENSOR;
@@ -132,11 +131,11 @@ ao_send_configuration(void)
 		telemetry.configuration.main_deploy = ao_config.main_deploy;
 		telemetry.configuration.flight_log_max = ao_config.flight_log_max >> 10;
 		ao_xmemcpy (telemetry.configuration.callsign,
-			ao_config.callsign,
-			AO_MAX_CALLSIGN);
+			    ao_config.callsign,
+			    AO_MAX_CALLSIGN);
 		ao_xmemcpy (telemetry.configuration.version,
-			ao_version,
-			AO_MAX_VERSION);
+			    CODE_TO_XDATA(ao_version),
+			    AO_MAX_VERSION);
 		ao_radio_send(&telemetry, sizeof (telemetry));
 		ao_telemetry_config_cur = ao_telemetry_config_max;
 	}