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 eba72b4f7c9a86f25a26783d5a9c42b088d7fed8..f07dc26ed975fc11b0d5324720bf14cf471d1f29 100644 (file)
--- a/src/megametrum-v0.1/ao_pins.h
+++ b/src/megametrum-v0.1/ao_pins.h
@@ -18,7 +18,7 @@
 #ifndef _AO_PINS_H_
 #define _AO_PINS_H_
 
-#define HAS_MS5611             1
+#define HAS_TASK_QUEUE         1
 
 /* 8MHz High speed external crystal */
 #define AO_HSE                 8000000
@@ -62,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
@@ -248,7 +249,8 @@ struct ao_adc {
  * Pressure sensor settings
  */
 #define HAS_MS5607             1
-#define AO_MS5607_PRIVATE_PINS 0
+#define HAS_MS5611             0
+#define AO_MS5607_PRIVATE_PINS 1
 #define AO_MS5607_CS_PORT      (&stm_gpioc)
 #define AO_MS5607_CS_PIN       4
 #define AO_MS5607_CS_MASK      (1 << AO_MS5607_CS)