Merge branch 'micropeak-1.1'

[fw/altos] / src / megametrum-v0.1 / ao_pins.h

diff --git a/src/megametrum-v0.1/ao_pins.h b/src/megametrum-v0.1/ao_pins.h
index 8b631ae970dff80f19787919843a9c7d30fc5adb..f07dc26ed975fc11b0d5324720bf14cf471d1f29 100644 (file)
--- a/src/megametrum-v0.1/ao_pins.h
+++ b/src/megametrum-v0.1/ao_pins.h
@@ -18,6 +18,8 @@
 #ifndef _AO_PINS_H_
 #define _AO_PINS_H_
 
+#define HAS_TASK_QUEUE         1
+
 /* 8MHz High speed external crystal */
 #define AO_HSE                 8000000
 
@@ -60,6 +62,7 @@
 #define ao_gps_getchar         ao_serial3_getchar
 #define ao_gps_putchar         ao_serial3_putchar
 #define ao_gps_set_speed       ao_serial3_set_speed
+#define ao_gps_fifo            (ao_stm_usart3.rx_fifo)
 
 #define HAS_EEPROM             1
 #define USE_INTERNAL_FLASH     0
@@ -77,10 +80,10 @@
 #define SPI_2_PB13_PB14_PB15   1       /* Flash, Companion */
 #define SPI_2_PD1_PD3_PD4      0
 
-#define SPI_2_GPIO             (&stm_gpiob)
-#define SPI_2_SCK              13
-#define SPI_2_MISO             14
-#define SPI_2_MOSI             15
+#define SPI_2_PORT             (&stm_gpiob)
+#define SPI_2_SCK_PIN          13
+#define SPI_2_MISO_PIN         14
+#define SPI_2_MOSI_PIN         15
 
 #define HAS_I2C_1              1
 #define I2C_1_PB8_PB9          1
@@ -105,8 +108,6 @@
 #define HAS_GPS                        1
 #define HAS_FLIGHT             1
 #define HAS_ADC                        1
-#define HAS_ACCEL              1
-#define HAS_ACCEL_REF          1
 #define HAS_LOG                        1
 
 /*
@@ -248,12 +249,13 @@ struct ao_adc {
  * Pressure sensor settings
  */
 #define HAS_MS5607             1
+#define HAS_MS5611             0
 #define AO_MS5607_PRIVATE_PINS 1
-#define AO_MS5607_CS_GPIO      (&stm_gpioc)
-#define AO_MS5607_CS           4
+#define AO_MS5607_CS_PORT      (&stm_gpioc)
+#define AO_MS5607_CS_PIN       4
 #define AO_MS5607_CS_MASK      (1 << AO_MS5607_CS)
-#define AO_MS5607_MISO_GPIO    (&stm_gpioa)
-#define AO_MS5607_MISO         6
+#define AO_MS5607_MISO_PORT    (&stm_gpioa)
+#define AO_MS5607_MISO_PIN     6
 #define AO_MS5607_MISO_MASK    (1 << AO_MS5607_MISO)
 #define AO_MS5607_SPI_INDEX    AO_SPI_1_PA5_PA6_PA7
 
@@ -309,10 +311,10 @@ struct ao_adc {
  * mma655x
  */
 
-#define HAS_MMA655X            0
-#define AO_MMA655X_SPI_INDEX   AO_SPI_1_PA5_PA6_PA7
-#define AO_MMA655X_CS_GPIO     (&stm_gpiod)
-#define AO_MMA655X_CS          4
+#define HAS_MMA655X            1
+#define AO_MMA655X_SPI_INDEX   AO_SPI_1_PE13_PE14_PE15
+#define AO_MMA655X_CS_PORT     (&stm_gpiod)
+#define AO_MMA655X_CS_PIN      4
 
 #define NUM_CMDS               16