X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fcore%2Fao.h;h=0275cad1e9536278aa7e06ad15303f190e20f311;hp=98a01a4a8caa55d8593962944fb82530deeaa3a4;hb=a731d240f802d37524ce84c3c6acf22bcda4d522;hpb=8125acc030574afed6f23aa8aa302d9c768bb04e

diff --git a/src/core/ao.h b/src/core/ao.h
index 98a01a4a..0275cad1 100644
--- a/src/core/ao.h
+++ b/src/core/ao.h
@@ -37,9 +37,9 @@
 struct ao_task {
 	__xdata void *wchan;		/* current wait channel (NULL if running) */
 	uint16_t alarm;			/* abort ao_sleep time */
+	ao_arch_task_members		/* any architecture-specific fields */
 	uint8_t task_id;		/* unique id */
 	__code char *name;		/* task name */
-	ao_arch_task_members		/* any architecture-specific fields */
 	uint8_t	stack[AO_STACK_SIZE];	/* saved stack */
 };
 
@@ -144,15 +144,6 @@ ao_clock_init(void);
 /*
  * One set of samples read from the A/D converter or telemetry
  */
-struct ao_adc {
-	uint16_t	tick;		/* tick when the sample was read */
-	int16_t		accel;		/* accelerometer */
-	int16_t		pres;		/* pressure sensor */
-	int16_t		temp;		/* temperature sensor */
-	int16_t		v_batt;		/* battery voltage */
-	int16_t		sense_d;	/* drogue continuity sense */
-	int16_t		sense_m;	/* main continuity sense */
-};
 
 #if HAS_ADC
 
@@ -160,7 +151,6 @@ struct ao_adc {
  * ao_adc.c
  */
 
-#define AO_ADC_RING	32
 #define ao_adc_ring_next(n)	(((n) + 1) & (AO_ADC_RING - 1))
 #define ao_adc_ring_prev(n)	(((n) - 1) & (AO_ADC_RING - 1))
 
@@ -505,6 +495,23 @@ extern __pdata uint32_t ao_log_start_pos;
 extern __xdata uint8_t	ao_log_running;
 extern __pdata enum flight_state ao_log_state;
 
+#define AO_LOG_TELESCIENCE_START	((uint8_t) 's')
+#define AO_LOG_TELESCIENCE_DATA		((uint8_t) 'd')
+
+#define AO_LOG_TELESCIENCE_NUM_ADC	12
+
+struct ao_log_telescience {
+	uint8_t		type;
+	uint8_t		csum;
+	uint16_t	tick;
+	uint16_t	tm_tick;
+	uint8_t		tm_state;
+	uint8_t		unused;
+	uint16_t	adc[AO_LOG_TELESCIENCE_NUM_ADC];
+};
+
+extern struct ao_log_telescience ao_log_store;
+
 /* required functions from the underlying log system */
 
 #define AO_LOG_FORMAT_UNKNOWN		0	/* unknown; altosui will have to guess */
@@ -970,6 +977,16 @@ ao_spi_recv(void __xdata *block, uint16_t len) __reentrant;
 void
 ao_spi_init(void);
 
+/*
+ * ao_spi_slave.c
+ */
+
+void
+ao_spi_slave_debug(void);
+
+void
+ao_spi_slave_init(void);
+
 /*
  * ao_telemetry.c
  */
@@ -1101,6 +1118,30 @@ struct ao_telemetry_companion {
 	/* 32 */
 };
 	
+/* #define AO_SEND_ALL_BARO */
+
+#define AO_TELEMETRY_BARO		0x80
+
+/*
+ * This packet allows the full sampling rate baro
+ * data to be captured over the RF link so that the
+ * flight software can be tested using 'real' data.
+ *
+ * Along with this telemetry packet, the flight
+ * code is modified to send full-rate telemetry all the time
+ * and never send an RDF tone; this ensure that the full radio
+ * link is available.
+ */
+struct ao_telemetry_baro {
+	uint16_t				serial;		/*  0 */
+	uint16_t				tick;		/*  2 */
+	uint8_t					type;		/*  4 */
+	uint8_t					samples;	/*  5 number samples */
+
+	int16_t					baro[12];	/* 6 samples */
+	/* 32 */
+};
+
 union ao_telemetry_all {
 	struct ao_telemetry_generic		generic;
 	struct ao_telemetry_sensor		sensor;
@@ -1108,6 +1149,7 @@ union ao_telemetry_all {
 	struct ao_telemetry_location		location;
 	struct ao_telemetry_satellite		satellite;
 	struct ao_telemetry_companion		companion;
+	struct ao_telemetry_baro		baro;
 };
 
 /*
@@ -1241,9 +1283,15 @@ struct ao_telemetry_raw_recv {
 
 /* Set delay between telemetry reports (0 to disable) */
 
+#ifdef AO_SEND_ALL_BARO
+#define AO_TELEMETRY_INTERVAL_PAD	AO_MS_TO_TICKS(100)
+#define AO_TELEMETRY_INTERVAL_FLIGHT	AO_MS_TO_TICKS(100)
+#define AO_TELEMETRY_INTERVAL_RECOVER	AO_MS_TO_TICKS(100)
+#else
 #define AO_TELEMETRY_INTERVAL_PAD	AO_MS_TO_TICKS(1000)
 #define AO_TELEMETRY_INTERVAL_FLIGHT	AO_MS_TO_TICKS(100)
 #define AO_TELEMETRY_INTERVAL_RECOVER	AO_MS_TO_TICKS(1000)
+#endif
 
 void
 ao_telemetry_set_interval(uint16_t interval);
@@ -1568,8 +1616,9 @@ struct ao_companion_setup {
 };
 
 extern __pdata uint8_t				ao_companion_running;
-extern __xdata struct ao_companion_setup	ao_companion_setup;
 extern __xdata uint8_t				ao_companion_mutex;
+extern __xdata struct ao_companion_command	ao_companion_command;
+extern __xdata struct ao_companion_setup	ao_companion_setup;
 extern __xdata uint16_t				ao_companion_data[AO_COMPANION_MAX_CHANNELS];
 
 void
@@ -1580,4 +1629,30 @@ ao_companion_init(void);
 void
 ao_lcd_init(void);
 
+/* ao_aes.c */
+
+__xdata uint8_t ao_aes_mutex;
+
+enum ao_aes_mode {
+	ao_aes_mode_cbc_mac
+};
+
+#if HAS_AES
+void
+ao_aes_isr(void) __interrupt 4;
+#endif
+
+void
+ao_aes_set_mode(enum ao_aes_mode mode);
+
+void
+ao_aes_set_key(__xdata uint8_t *in);
+
+void
+ao_aes_run(__xdata uint8_t *in,
+	   __xdata uint8_t *out);
+
+void
+ao_aes_init(void);
+
 #endif /* _AO_H_ */