X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fmegametrum-v0.1%2Fao_pins.h;h=b1a70ea2ed56180ee1922b65a57f67380967aa3a;hp=f6b49dd0578b60675b11d81f3b18b1034fca48f1;hb=b6c9e8ffc87481a23ba90fa22df7c9421e2cd6a6;hpb=82fdc42d61340e6b76580ff12a9e1bea59eb8079

diff --git a/src/megametrum-v0.1/ao_pins.h b/src/megametrum-v0.1/ao_pins.h
index f6b49dd0..b1a70ea2 100644
--- 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
@@ -69,6 +70,7 @@
 #define HAS_BEEP		1
 #define HAS_RADIO		1
 #define HAS_TELEMETRY		1
+#define HAS_APRS		1
 
 #define HAS_SPI_1		1
 #define SPI_1_PA5_PA6_PA7	1	/* Barometer */
@@ -107,8 +109,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
 
 /*
@@ -250,6 +250,7 @@ struct ao_adc {
  * Pressure sensor settings
  */
 #define HAS_MS5607		1
+#define HAS_MS5611		0
 #define AO_MS5607_PRIVATE_PINS	1
 #define AO_MS5607_CS_PORT	(&stm_gpioc)
 #define AO_MS5607_CS_PIN	4
@@ -281,11 +282,19 @@ struct ao_adc {
 #define AO_CC1120_SPI_CS_PIN	5
 #define AO_CC1120_SPI_BUS	AO_SPI_2_PB13_PB14_PB15
 
-#define AO_CC1120_INT_PORT	(&stm_gpioc)
-#define AO_CC1120_INT_PIN	14
+#define AO_CC1120_INT_PORT		(&stm_gpioc)
+#define AO_CC1120_INT_PIN		14
+#define AO_CC1120_MCU_WAKEUP_PORT	(&stm_gpioc)
+#define AO_CC1120_MCU_WAKEUP_PIN	(0)
 
 #define AO_CC1120_INT_GPIO	2
-#define HAS_BOOT_RADIO		1
+#define AO_CC1120_INT_GPIO_IOCFG	CC1120_IOCFG2
+
+#define AO_CC1120_MARC_GPIO	3
+#define AO_CC1120_MARC_GPIO_IOCFG	CC1120_IOCFG3
+
+
+#define HAS_BOOT_RADIO		0
 
 /*
  * Mag sensor (hmc5883)