X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao.h;h=5bbe5158e8452707518f88cccf477cc83e960a48;hp=e1306c79715855da1c1d168619a83f0be00b4c5f;hb=02611efea0c485d78fad08c696c1f56e868d36b8;hpb=569a1dac55b70c30f01afa7bcb74442ecdd85d85

diff --git a/src/ao.h b/src/ao.h
index e1306c79..5bbe5158 100644
--- a/src/ao.h
+++ b/src/ao.h
@@ -163,6 +163,15 @@ struct ao_adc {
 #endif
 
 #if HAS_ADC
+
+#if HAS_ACCEL
+#ifndef HAS_ACCEL_REF
+#error Please define HAS_ACCEL_REF
+#endif
+#else
+#define HAS_ACCEL_REF 0
+#endif
+
 /*
  * ao_adc.c
  */
@@ -178,6 +187,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
@@ -295,7 +307,14 @@ extern __code __at (0x00a0) uint16_t ao_romconfig_version;
 extern __code __at (0x00a2) uint16_t ao_romconfig_check;
 extern __code __at (0x00a4) uint16_t ao_serial_number;
 extern __code __at (0x00a6) uint32_t ao_radio_cal;
+
+#ifndef HAS_USB
+#error Please define HAS_USB
+#endif
+
+#if HAS_USB
 extern __code __at (0x00aa) uint8_t ao_usb_descriptors [];
+#endif
 
 /*
  * ao_usb.c
@@ -319,9 +338,11 @@ ao_usb_pollchar(void);
 void
 ao_usb_flush(void);
 
+#if HAS_USB
 /* USB interrupt handler */
 void
 ao_usb_isr(void) __interrupt 6;
+#endif
 
 /* Enable the USB controller */
 void
@@ -372,7 +393,6 @@ uint8_t
 ao_match_word(__code char *word);
 
 struct ao_cmds {
-	char		cmd;
 	void		(*func)(void);
 	const char	*help;
 };
@@ -624,6 +644,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 +669,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 +876,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 +934,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;
@@ -1002,7 +1030,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 +1042,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;
@@ -1046,7 +1075,6 @@ ao_rssi_init(uint8_t rssi_led);
  * each instance of a product
  */
 
-extern __code __at(0x00aa) uint8_t ao_usb_descriptors [];
 extern const char ao_version[];
 extern const char ao_manufacturer[];
 extern const char ao_product[];