altos: Report log format in the version command

[fw/altos] / src-avr / ao.h

diff --git a/src-avr/ao.h b/src-avr/ao.h
index c548c618f87edc6281cb65adc9298bdf442d7e0b..c5032d16fe8ad5fc51d092a8b6ad5c233320c3e4 100644 (file)
--- a/src-avr/ao.h
+++ b/src-avr/ao.h
@@ -201,7 +201,7 @@ struct ao_adc {
  * ao_adc.c
  */
 
-#define AO_ADC_RING    16
+#define AO_ADC_RING    8
 
 #define ao_adc_ring_next(n)    (((n) + 1) & (AO_ADC_RING - 1))
 #define ao_adc_ring_prev(n)    (((n) - 1) & (AO_ADC_RING - 1))
@@ -577,12 +577,40 @@ extern __pdata uint32_t ao_log_start_pos;
 extern __xdata uint8_t ao_log_running;
 extern __xdata enum flight_state ao_log_state;
 
+#define AO_LOG_TELESCIENCE_START       ((uint8_t) 's')
+#define AO_LOG_TELESCIENCE_DATA                ((uint8_t) 'd')
+
+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[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 */
+#define AO_LOG_FORMAT_FULL             1       /* 8 byte typed log records */
+#define AO_LOG_FORMAT_TINY             2       /* two byte state/baro records */
+#define AO_LOG_FORMAT_TELEMETRY                3       /* 32 byte ao_telemetry records */
+#define AO_LOG_FORMAT_TELESCIENCE      4       /* 32 byte typed telescience records */
+#define AO_LOG_FORMAT_NONE             127     /* No log at all */
+
+extern __code uint8_t ao_log_format;
+
 /* Return the flight number from the given log slot, 0 if none */
 uint16_t
 ao_log_flight(uint8_t slot);
 
+/* Flash has been erased, go find the start of storage */
+void
+ao_log_restart(void);
+
 /* Flush the log */
 void
 ao_log_flush(void);
@@ -1343,6 +1371,7 @@ struct ao_fifo {
        (f).remove = ((f).remove + 1) & (AO_FIFO_SIZE-1); \
 } while(0)
 
+#define ao_fifo_reset(f)       ((f).insert = (f).remove = 0)
 #define ao_fifo_full(f)                ((((f).insert + 1) & (AO_FIFO_SIZE-1)) == (f).remove)
 #define ao_fifo_empty(f)       ((f).insert == (f).remove)
 
@@ -1423,12 +1452,15 @@ ao_debug_init(void);
 
 /* ao_spi_slave.c */
 
-void
+int
 ao_spi_slave_read(uint8_t *data, int len);
 
-void
+int
 ao_spi_slave_write(uint8_t *data, int len);
 
+void
+ao_spi_slave_debug(void);
+
 void
 ao_spi_slave_init(void);
 
@@ -1436,6 +1468,7 @@ ao_spi_slave_init(void);
 
 #define AO_COMPANION_SETUP             1
 #define AO_COMPANION_FETCH             2
+#define AO_COMPANION_STATE             3
 
 struct ao_companion_command {
        uint8_t         command;