#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
telemetry.generic.tick = packet->tick;
telemetry.generic.type = AO_TELEMETRY_MEGA_SENSOR;
- telemetry.mega_sensor.orient = ao_orient;
+ 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);
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);
{
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;
}
else
time = ao_time();
- bottom: ;
}
}
}