altos: Sample the accelerometer reference voltage on v1.1 boards

[fw/altos] / src / ao_telemetry.c

diff --git a/src/ao_telemetry.c b/src/ao_telemetry.c
index 9c923984cb200f08bb728ade6b25149bdbe352e3..7aad929fb8706e7a247cc855a19b164c5bf8ec3d 100644 (file)
--- a/src/ao_telemetry.c
+++ b/src/ao_telemetry.c
@@ -30,8 +30,11 @@ ao_telemetry(void)
        static __xdata struct ao_telemetry telemetry;
 
        ao_config_get();
+       while (!ao_flight_number)
+               ao_sleep(&ao_flight_number);
        memcpy(telemetry.callsign, ao_config.callsign, AO_MAX_CALLSIGN);
-       telemetry.addr = ao_serial_number;
+       telemetry.serial = ao_serial_number;
+       telemetry.flight = ao_log_full() ? 0 : ao_flight_number;
        telemetry.accel_plus_g = ao_config.accel_plus_g;
        telemetry.accel_minus_g = ao_config.accel_minus_g;
        ao_rdf_time = ao_time();
@@ -49,7 +52,7 @@ ao_telemetry(void)
                memcpy(&telemetry.gps, &ao_gps_data, sizeof (struct ao_gps_data));
                memcpy(&telemetry.gps_tracking, &ao_gps_tracking_data, sizeof (struct ao_gps_tracking_data));
                ao_mutex_put(&ao_gps_mutex);
-               ao_radio_send(&telemetry);
+               ao_radio_send(&telemetry, sizeof (telemetry));
                ao_delay(ao_telemetry_interval);
                if (ao_rdf &&
                    (int16_t) (ao_time() - ao_rdf_time) >= 0)