X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fao.h;h=791064e8d25c7b6c3e5e52c2e3d0c7beaf56cdb4;hb=fdd15a254c6fab5ba2d02320ba0ceb3e6a56354c;hp=a5890d4726736538d03baa9c6414842799a975aa;hpb=a9b210bc33cd95e7108ab51925fdf0d5e8deaf7e;p=fw%2Faltos

diff --git a/src/ao.h b/src/ao.h
index a5890d47..791064e8 100644
--- 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
@@ -372,7 +380,6 @@ uint8_t
 ao_match_word(__code char *word);
 
 struct ao_cmds {
-	char		cmd;
 	void		(*func)(void);
 	const char	*help;
 };
@@ -624,6 +631,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 +656,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 +863,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;
@@ -906,13 +921,13 @@ ao_radio_get(void);
 #define ao_radio_put() ao_mutex_put(&ao_radio_mutex)
 
 void
-ao_radio_set_telemetry(void);
+ao_radio_set_fixed_pkt(size_t size);
 
-void
-ao_radio_set_packet(void);
+#define ao_radio_set_telemetry() \
+        ao_radio_set_fixed_pkt(sizeof (struct ao_telemetry))
 
-void
-ao_radio_set_rdf(void);
+#define ao_radio_set_packet() \
+        ao_radio_set_fixed_pkt(sizeof (struct ao_packet))
 
 void
 ao_radio_send(__xdata void *data, uint8_t size) __reentrant;