X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fmegametrum-v0.1%2Fao_pins.h;h=724878b51c6bcfee669cfc7f9d8264f9e1a1a92c;hb=c676ad8048d10ad9da22ea3acf19e4e1872103ff;hp=6256d2f64a07f37790b7e75177ded24ecce7fa3a;hpb=93db8febda03d9a02c5c1ccdc6ad44eaf00a433b;p=fw%2Faltos

diff --git a/src/megametrum-v0.1/ao_pins.h b/src/megametrum-v0.1/ao_pins.h
index 6256d2f6..724878b5 100644
--- 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_MS5611		1
+
 /* 8MHz High speed external crystal */
 #define AO_HSE			8000000
 
@@ -77,10 +79,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 +107,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
 
 /*
@@ -249,11 +249,11 @@ struct ao_adc {
  */
 #define HAS_MS5607		1
 #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
 
@@ -310,9 +310,9 @@ struct ao_adc {
  */
 
 #define HAS_MMA655X		1
-#define AO_MMA655X_SPI_INDEX	AO_SPI_1_PA5_PA6_PA7
-#define AO_MMA655X_CS_GPIO	(&stm_gpiod)
-#define AO_MMA655X_CS		4
+#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