altos/test: Add dependencies in the Makefile for ao_flight_test

[fw/altos] / src / ao.h

diff --git a/src/ao.h b/src/ao.h
index 37a39a790b643b7061a1614fa3e6f128d90b4a5d..cef20e61731e869a5a3a517d7a2186cf9fa5c694 100644 (file)
--- a/src/ao.h
+++ b/src/ao.h
@@ -163,6 +163,11 @@ struct ao_adc {
 #endif
 
 #if HAS_ADC
+
+#ifndef HAS_ACCEL_REF
+#error Please define HAS_ACCEL_REF
+#endif
+
 /*
  * ao_adc.c
  */
@@ -178,6 +183,9 @@ struct ao_adc {
  */
 extern volatile __xdata struct ao_adc  ao_adc_ring[AO_ADC_RING];
 extern volatile __data uint8_t         ao_adc_head;
+#if HAS_ACCEL_REF
+extern volatile __xdata uint16_t       ao_accel_ref[AO_ADC_RING];
+#endif
 
 /* Trigger a conversion sequence (called from the timer interrupt) */
 void
@@ -649,7 +657,7 @@ enum ao_flight_state {
        ao_flight_invalid = 9
 };
 
-extern __xdata struct ao_adc           ao_flight_data;
+extern __data uint8_t                  ao_flight_adc;
 extern __pdata enum ao_flight_state    ao_flight_state;
 extern __pdata uint16_t                        ao_flight_tick;
 extern __pdata int16_t                 ao_flight_accel;
@@ -856,7 +864,7 @@ ao_gps_report_init(void);
 #define AO_TELEMETRY_VERSION   3
 
 struct ao_telemetry {
-       uint8_t                 addr;
+       uint16_t                serial;
        uint16_t                flight;
        uint8_t                 flight_state;
        int16_t                 flight_accel;