X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fmegametrum-v0.1%2Fao_pins.h;h=64da41a915304f618b6aa0547969701d0dcd2b55;hb=ed200884f3e4fb895ee17ef38a9b6d3371b59625;hp=eba72b4f7c9a86f25a26783d5a9c42b088d7fed8;hpb=0b28eefe6b32033a0e85731aa38af7e07a8b45f5;p=fw%2Faltos

diff --git a/src/megametrum-v0.1/ao_pins.h b/src/megametrum-v0.1/ao_pins.h
index eba72b4f..64da41a9 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 */
@@ -248,7 +250,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)
@@ -278,12 +281,21 @@ struct ao_adc {
 #define AO_CC1120_SPI_CS_PORT	(&stm_gpioc)
 #define AO_CC1120_SPI_CS_PIN	5
 #define AO_CC1120_SPI_BUS	AO_SPI_2_PB13_PB14_PB15
+#define AO_CC1120_SPI		stm_spi2
 
-#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)