#include "ao.h"
#include "ao_product.h"
-__xdata uint16_t ao_telemetry_interval;
-__xdata int8_t ao_telemetry_config_max;
-__xdata int8_t ao_telemetry_config_cur;
+static __pdata uint16_t ao_telemetry_interval;
+static __pdata int8_t ao_telemetry_config_max;
+static __pdata int8_t ao_telemetry_config_cur;
#if HAS_GPS
-__xdata int8_t ao_telemetry_loc_cur;
-__xdata int8_t ao_telemetry_sat_cur;
+static __pdata int8_t ao_telemetry_loc_cur;
+static __pdata int8_t ao_telemetry_sat_cur;
#endif
-__xdata uint8_t ao_rdf = 0;
-__xdata uint16_t ao_rdf_time;
+static __pdata uint8_t ao_rdf = 0;
+static __pdata uint16_t ao_rdf_time;
#define AO_RDF_INTERVAL_TICKS AO_SEC_TO_TICKS(5)
#define AO_RDF_LENGTH_MS 500
telemetry.sensor.height = ao_height;
telemetry.sensor.ground_pres = ao_ground_pres;
+#if HAS_ACCEL
telemetry.sensor.ground_accel = ao_ground_accel;
telemetry.sensor.accel_plus_g = ao_config.accel_plus_g;
telemetry.sensor.accel_minus_g = ao_config.accel_minus_g;
+#else
+ telemetry.sensor.ground_accel = 0;
+ telemetry.sensor.accel_plus_g = 0;
+ telemetry.sensor.accel_minus_g = 0;
+#endif
ao_radio_send(&telemetry, sizeof (telemetry));
}
telemetry.configuration.flight = ao_flight_number;
telemetry.configuration.config_major = AO_CONFIG_MAJOR;
telemetry.configuration.config_minor = AO_CONFIG_MINOR;
+ telemetry.configuration.apogee_delay = ao_config.apogee_delay;
telemetry.configuration.main_deploy = ao_config.main_deploy;
- telemetry.configuration.flight_log_max = ao_config.flight_log_max;
+ telemetry.configuration.flight_log_max = ao_config.flight_log_max >> 10;
memcpy (telemetry.configuration.callsign,
ao_config.callsign,
AO_MAX_CALLSIGN);
telemetry.generic.serial = ao_serial_number;
for (;;) {
while (ao_telemetry_interval == 0)
- ao_sleep(&ao_telemetry_interval);
+ ao_sleep(&telemetry);
time = ao_rdf_time = ao_time();
while (ao_telemetry_interval) {
{
ao_telemetry_interval = interval;
ao_telemetry_config_max = AO_SEC_TO_TICKS(1) / interval;
- ao_telemetry_config_cur = 0;
+ ao_telemetry_config_cur = 1;
#if HAS_GPS
- ao_telemetry_loc_cur = 0;
- if (ao_telemetry_config_max - 1 > ao_telemetry_loc_cur)
+ ao_telemetry_loc_cur = 1;
+ if (ao_telemetry_config_max > ao_telemetry_loc_cur)
ao_telemetry_loc_cur++;
ao_telemetry_sat_cur = ao_telemetry_loc_cur;
- if (ao_telemetry_config_max - 1 > ao_telemetry_sat_cur)
+ if (ao_telemetry_config_max > ao_telemetry_sat_cur)
ao_telemetry_sat_cur++;
#endif
- ao_wakeup(&ao_telemetry_interval);
+ ao_wakeup(&telemetry);
}
void