X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fmegametrum-v0.1%2Fao_pins.h;h=d6394d9b86e1aabd90ebdaf6bd2a1cb38f86238d;hp=46098d34689d060af88bdb24b6b762ab2d676835;hb=9aa7993ee31bdfd6890ad7262a0375c07464ee76;hpb=0dd9e1dd62656a931f9559af6da9131f704f83f9

diff --git a/src/megametrum-v0.1/ao_pins.h b/src/megametrum-v0.1/ao_pins.h
index 46098d34..d6394d9b 100644
--- a/src/megametrum-v0.1/ao_pins.h
+++ b/src/megametrum-v0.1/ao_pins.h
@@ -21,7 +21,7 @@
 /* 8MHz High speed external crystal */
 #define AO_HSE			8000000
 
-/* PLLVCO = 96MHz (so that USB will work*/
+/* PLLVCO = 96MHz (so that USB will work) */
 #define AO_PLLMUL		12
 #define AO_RCC_CFGR_PLLMUL	(STM_RCC_CFGR_PLLMUL_12)
 
@@ -42,7 +42,7 @@
 #define AO_RCC_CFGR_PPRE2_DIV	STM_RCC_CFGR_PPRE2_DIV_2
 
 #define HAS_SERIAL_1		1
-#define USE_SERIAL_1_STDIN	1
+#define USE_SERIAL_1_STDIN	0
 #define SERIAL_1_PB6_PB7	0
 #define SERIAL_1_PA9_PA10	1
 
@@ -61,8 +61,10 @@
 #define ao_gps_putchar		ao_serial3_putchar
 #define ao_gps_set_speed	ao_serial3_set_speed
 
-#define HAS_USB			0
-#define HAS_BEEP		0
+#define HAS_EEPROM		1
+#define USE_INTERNAL_FLASH	0
+#define HAS_USB			1
+#define HAS_BEEP		1
 
 #define HAS_SPI_1		1
 #define SPI_1_PA5_PA6_PA7	1
@@ -92,16 +94,22 @@
 
 #define LEDS_AVAILABLE		(AO_LED_RED | AO_LED_GREEN)
 
+#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
 
-#define AO_ADC_RING		32
+#define AO_DATA_RING		32
 #define AO_ADC_NUM_SENSE	6
 
 struct ao_adc {
-	uint16_t		tick;
 	int16_t			sense[AO_ADC_NUM_SENSE];
 	int16_t			v_batt;
 	int16_t			v_pbatt;
+	int16_t			accel_ref;
+	int16_t			accel;
 	int16_t			temp;
 };
 
@@ -137,13 +145,22 @@ struct ao_adc {
 #define AO_ADC_V_PBATT_PORT	stm_gpiob
 #define AO_ADC_V_PBATT_PIN	1
 
+#define AO_ADC_ACCEL_REF	10
+#define AO_ADC_ACCEL_REF_PORT	stm_gpioc
+#define AO_ADC_ACCEL_REF_PIN	0
+
+#define AO_ADC_ACCEL		11
+#define AO_ADC_ACCEL_PORT	stm_gpioc
+#define AO_ADC_ACCEL_PIN	1
+
 #define AO_ADC_TEMP		16
 
 #define AO_ADC_RCC_AHBENR	((1 << STM_RCC_AHBENR_GPIOAEN) | \
 				 (1 << STM_RCC_AHBENR_GPIOEEN) | \
-				 (1 << STM_RCC_AHBENR_GPIOBEN))
+				 (1 << STM_RCC_AHBENR_GPIOBEN) | \
+				 (1 << STM_RCC_AHBENR_GPIOCEN))
 
-#define AO_NUM_ADC_PIN		(AO_ADC_NUM_SENSE + 2)
+#define AO_NUM_ADC_PIN		(AO_ADC_NUM_SENSE + 4)
 
 #define AO_ADC_PIN0_PORT	AO_ADC_SENSE_A_PORT
 #define AO_ADC_PIN0_PIN		AO_ADC_SENSE_A_PIN
@@ -161,8 +178,12 @@ struct ao_adc {
 #define AO_ADC_PIN6_PIN		AO_ADC_V_BATT_PIN
 #define AO_ADC_PIN7_PORT	AO_ADC_V_PBATT_PORT
 #define AO_ADC_PIN7_PIN		AO_ADC_V_PBATT_PIN
+#define AO_ADC_PIN8_PORT	AO_ADC_ACCEL_REF_PORT
+#define AO_ADC_PIN8_PIN		AO_ADC_ACCEL_REF_PIN
+#define AO_ADC_PIN9_PORT	AO_ADC_ACCEL_PORT
+#define AO_ADC_PIN9_PIN		AO_ADC_ACCEL_PIN
 
-#define AO_NUM_ADC	       	(AO_ADC_NUM_SENSE + 3)
+#define AO_NUM_ADC	       	(AO_ADC_NUM_SENSE + 5)
 
 #define AO_ADC_SQ1		AO_ADC_SENSE_A
 #define AO_ADC_SQ2		AO_ADC_SENSE_B
@@ -172,14 +193,20 @@ struct ao_adc {
 #define AO_ADC_SQ6		AO_ADC_SENSE_F
 #define AO_ADC_SQ7		AO_ADC_V_BATT
 #define AO_ADC_SQ8		AO_ADC_V_PBATT
-#define AO_ADC_SQ9		AO_ADC_TEMP
+#define AO_ADC_SQ9		AO_ADC_ACCEL_REF
+#define AO_ADC_SQ10		AO_ADC_ACCEL
+#define AO_ADC_SQ11		AO_ADC_TEMP
 
 /*
  * Pressure sensor settings
  */
+#define HAS_MS5607		1
 #define AO_MS5607_CS_GPIO	stm_gpioc
 #define AO_MS5607_CS		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_MASK	(1 << AO_MS5607_MISO)
 #define AO_MS5607_SPI_INDEX	(STM_SPI_INDEX(1))
 
 /*
@@ -191,4 +218,37 @@ struct ao_adc {
 #define AO_M25_SPI_CS_MASK	(1 << 3)
 #define AO_M25_SPI_BUS		STM_SPI_INDEX(2)
 
+/*
+ * Radio (cc1120)
+ */
+
+#define AO_CC1120_SPI_CS_PORT	stm_gpioc
+#define AO_CC1120_SPI_CS_PIN	5
+#define AO_CC1120_SPI_BUS	STM_SPI_INDEX(2)
+
+#define AO_CC1120_INT_PORT	stm_gpioc
+#define AO_CC1120_INT_PIN	14
+
+#define AO_CC1120_INT_GPIO	2
+
+/*
+ * Mag sensor (hmc5883)
+ */
+
+#define HAS_HMC5883		1
+#define AO_HMC5883_INT_PORT	stm_gpioc
+#define AO_HMC5883_INT_PIN	12
+#define AO_HMC5883_I2C_INDEX	STM_I2C_INDEX(1)
+
+/*
+ * mpu6000
+ */
+
+#define HAS_MPU6000		1	
+#define AO_MPU6000_INT_PORT	stm_gpioc
+#define AO_MPU6000_INT_PIN	13
+#define AO_MPU6000_I2C_INDEX	STM_I2C_INDEX(1)
+
+#define HAS_HIGHG_ACCEL		1
+
 #endif /* _AO_PINS_H_ */