X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcore%2Fao_telemetry.c;h=a1c19185416fd56cdd3a1dac6bcabf892ef8ec0c;hb=32f0f39a953dabe19ec92611570e4a82da8f8dce;hp=6b47a06a1cbf42dec3a81d2cb105abf953cf55b4;hpb=7f4650990e8a7cfcf8461e8928dfc426c9a563cc;p=fw%2Faltos

diff --git a/src/core/ao_telemetry.c b/src/core/ao_telemetry.c
index 6b47a06a..a1c19185 100644
--- a/src/core/ao_telemetry.c
+++ b/src/core/ao_telemetry.c
@@ -24,9 +24,9 @@
 #endif
 
 static __pdata uint16_t ao_telemetry_interval;
-static __pdata uint8_t ao_rdf = 0;
 
 #if HAS_RDF
+static __pdata uint8_t ao_rdf = 0;
 static __pdata uint16_t ao_rdf_time;
 #endif
 
@@ -115,6 +115,7 @@ ao_send_mega_sensor(void)
 	telemetry.generic.tick = packet->tick;
 	telemetry.generic.type = AO_TELEMETRY_MEGA_SENSOR;
 
+	telemetry.mega_sensor.orient = ao_sample_orient;
 	telemetry.mega_sensor.accel = ao_data_accel(packet);
 	telemetry.mega_sensor.pres = ao_data_pres(packet);
 	telemetry.mega_sensor.temp = ao_data_temp(packet);
@@ -186,7 +187,9 @@ ao_send_metrum_sensor(void)
 	telemetry.generic.type = AO_TELEMETRY_METRUM_SENSOR;
 
 	telemetry.metrum_sensor.state = ao_flight_state;
+#if HAS_ACCEL
 	telemetry.metrum_sensor.accel = ao_data_accel(packet);
+#endif
 	telemetry.metrum_sensor.pres = ao_data_pres(packet);
 	telemetry.metrum_sensor.temp = ao_data_temp(packet);
 
@@ -210,15 +213,20 @@ ao_send_metrum_data(void)
 {
 	if (--ao_telemetry_metrum_data_cur <= 0) {
 		__xdata	struct ao_data *packet = (__xdata struct ao_data *) &ao_data_ring[ao_data_ring_prev(ao_sample_data)];
-		uint8_t	i;
 
 		telemetry.generic.tick = packet->tick;
 		telemetry.generic.type = AO_TELEMETRY_METRUM_DATA;
 
 		telemetry.metrum_data.ground_pres = ao_ground_pres;
+#if HAS_ACCEL
 		telemetry.metrum_data.ground_accel = ao_ground_accel;
 		telemetry.metrum_data.accel_plus_g = ao_config.accel_plus_g;
 		telemetry.metrum_data.accel_minus_g = ao_config.accel_minus_g;
+#else
+		telemetry.metrum_data.ground_accel = 1;
+		telemetry.metrum_data.accel_plus_g = 0;
+		telemetry.metrum_data.accel_minus_g = 2;
+#endif
 
 		ao_radio_send(&telemetry, sizeof (telemetry));
 		ao_telemetry_metrum_data_cur = ao_telemetry_metrum_data_max;
@@ -472,7 +480,6 @@ ao_telemetry(void)
 			}
 			else
 				time = ao_time();
-		bottom:	;
 		}
 	}
 }