altos: Clean up warnings for LPC products

[fw/altos] / src / core / ao_telemetry.c

diff --git a/src/core/ao_telemetry.c b/src/core/ao_telemetry.c
index cd95aa6bce3d0a995d70b6fd30a90d49a75ca07a..5a00d825671d7ae35ceee5f1f06ddce0b7f98081 100644 (file)
--- 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);
@@ -182,6 +183,7 @@ ao_send_metrum_sensor(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_METRUM_SENSOR;
 
        telemetry.metrum_sensor.state = ao_flight_state;
@@ -209,7 +211,6 @@ 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;
@@ -471,7 +472,6 @@ ao_telemetry(void)
                        }
                        else
                                time = ao_time();
-               bottom: ;
                }
        }
 }