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 e1306c79715855da1c1d168619a83f0be00b4c5f..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
@@ -624,6 +632,14 @@ ao_log_init(void);
 void
 ao_log_write_erase(uint8_t pos);
 
+/* Returns true if there are any logs stored in eeprom */
+uint8_t
+ao_log_present(void);
+
+/* Returns true if there is no more storage space available */
+uint8_t
+ao_log_full(void);
+
 /*
  * ao_flight.c
  */
@@ -641,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;
@@ -848,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;
@@ -1002,7 +1018,7 @@ ao_igniter_init(void);
  */
 
 #define AO_CONFIG_MAJOR        1
-#define AO_CONFIG_MINOR        3
+#define AO_CONFIG_MINOR        4
 
 struct ao_config {
        uint8_t         major;
@@ -1014,6 +1030,7 @@ struct ao_config {
        uint8_t         apogee_delay;           /* minor version 1 */
        int16_t         accel_minus_g;          /* minor version 2 */
        uint32_t        radio_cal;              /* minor version 3 */
+       uint32_t        flight_log_max;         /* minor version 4 */
 };
 
 extern __xdata struct ao_config ao_config;