altos-avr: Completely replace the spi slave code

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

diff --git a/src-avr/ao.h b/src-avr/ao.h
index 90298a3eced06f069a3a066384a583a8b71864a0..fb3612d41a4a6a226b9ae85033236716ab8fed06 100644 (file)
--- a/src-avr/ao.h
+++ b/src-avr/ao.h
@@ -65,6 +65,10 @@ extern __xdata struct ao_task *__data ao_cur_task;
 #define AO_NUM_TASKS           16      /* maximum number of tasks */
 #define AO_NO_TASK             0       /* no task id */
 
+#ifdef AVR
+extern uint8_t ao_cpu_sleep_disable;
+#endif
+
 /*
  ao_task.c
  */
@@ -165,14 +169,22 @@ ao_clock_init(void);
 /*
  * One set of samples read from the A/D converter or telemetry
  */
+#ifdef AVR
+#define NUM_ADC                12
+#endif
+
 struct ao_adc {
        uint16_t        tick;           /* tick when the sample was read */
+#ifdef AVR
+       uint16_t        adc[NUM_ADC];   /* samples */
+#else
        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 */
+#endif
 };
 
 #if HAS_ADC
@@ -189,7 +201,8 @@ struct ao_adc {
  * ao_adc.c
  */
 
-#define AO_ADC_RING    32
+#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))
 
@@ -310,6 +323,13 @@ ao_led_for(uint8_t colors, uint16_t ticks) __reentrant;
 void
 ao_led_init(uint8_t enable);
 
+/*
+ * ao_lcd.c
+ */
+
+void
+ao_lcd_init(void);
+
 /*
  * ao_romconfig.c
  */
@@ -1323,6 +1343,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)
 
@@ -1401,4 +1422,36 @@ ao_btm_init(void);
 void
 ao_debug_init(void);
 
+/* ao_spi_slave.c */
+
+int
+ao_spi_slave_read(uint8_t *data, int len);
+
+int
+ao_spi_slave_write(uint8_t *data, int len);
+
+void
+ao_spi_slave_debug(void);
+
+void
+ao_spi_slave_init(void);
+
+/* ao_companion.c */
+
+#define AO_COMPANION_SETUP             1
+#define AO_COMPANION_FETCH             2
+
+struct ao_companion_command {
+       uint8_t         command;
+       uint8_t         flight_state;
+       uint16_t        tick;
+};
+
+struct ao_companion_setup {
+       uint16_t        board_id;
+       uint16_t        board_id_inverse;
+       uint8_t         update_period;
+       uint8_t         channels;
+};
+
 #endif /* _AO_H_ */