X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_telemetry.c;h=2ae1e41bb42ffb31701176424c461831c52d98b6;hb=256ddea8c430b4b5dcb8bb95c19ad26032129e1b;hp=fa8178240e45b97f60c71717eb77d76fd3e3e69c;hpb=59ac667c4ae14e0fa699fb0f398d31763a237646;p=fw%2Faltos

diff --git a/src/kernel/ao_telemetry.c b/src/kernel/ao_telemetry.c
index fa817824..2ae1e41b 100644
--- a/src/kernel/ao_telemetry.c
+++ b/src/kernel/ao_telemetry.c
@@ -160,8 +160,8 @@ ao_send_mega_sensor(void)
 
 #if HAS_HMC5883
 	telemetry.mega_sensor.mag_x = packet->hmc5883.x;
-	telemetry.mega_sensor.mag_y = packet->hmc5883.y;
 	telemetry.mega_sensor.mag_z = packet->hmc5883.z;
+	telemetry.mega_sensor.mag_y = packet->hmc5883.y;
 #endif
 
 	ao_telemetry_send();
@@ -296,6 +296,10 @@ static __pdata int8_t ao_telemetry_config_max;
 static __pdata int8_t ao_telemetry_config_cur;
 static __pdata uint16_t ao_telemetry_flight_number;
 
+#ifndef ao_telemetry_battery_convert
+#define ao_telemetry_battery_convert(a) (a)
+#endif
+
 static void
 ao_send_configuration(void)
 {
@@ -308,7 +312,7 @@ ao_send_configuration(void)
 		telemetry.configuration.config_minor = AO_CONFIG_MINOR;
 #if AO_idProduct_NUMBER == 0x25 && HAS_ADC
 		/* TeleGPS gets battery voltage instead of apogee delay */
-		telemetry.configuration.apogee_delay = ao_data_ring[ao_data_ring_prev(ao_data_head)].adc.v_batt;
+		telemetry.configuration.apogee_delay = ao_telemetry_battery_convert(ao_data_ring[ao_data_ring_prev(ao_data_head)].adc.v_batt);
 #else
 		telemetry.configuration.apogee_delay = ao_config.apogee_delay;
 		telemetry.configuration.main_deploy = ao_config.main_deploy;