projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/megametrum: Make MS5607 driver hold SPI bus for whole operation
[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 6256d2f64a07f37790b7e75177ded24ecce7fa3a..eba72b4f7c9a86f25a26783d5a9c42b088d7fed8 100644
(file)
--- 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_
#ifndef _AO_PINS_H_
#define _AO_PINS_H_
+#define HAS_MS5611 1
+
/* 8MHz High speed external crystal */
#define AO_HSE 8000000
/* 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_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
#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_GPS 1
#define HAS_FLIGHT 1
#define HAS_ADC 1
-#define HAS_ACCEL 1
-#define HAS_ACCEL_REF 1
#define HAS_LOG 1
/*
#define HAS_LOG 1
/*
@@
-248,12
+248,12
@@
struct ao_adc {
* Pressure sensor settings
*/
#define HAS_MS5607 1
* Pressure sensor settings
*/
#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_PRIVATE_PINS
0
+#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_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
#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 HAS_MMA655X 1
-#define AO_MMA655X_SPI_INDEX AO_SPI_1_P
A5_PA6_PA7
-#define AO_MMA655X_CS_
GPIO
(&stm_gpiod)
-#define AO_MMA655X_CS
4
+#define AO_MMA655X_SPI_INDEX AO_SPI_1_P
E13_PE14_PE15
+#define AO_MMA655X_CS_
PORT
(&stm_gpiod)
+#define AO_MMA655X_CS
_PIN
4
#define NUM_CMDS 16
#define NUM_CMDS 16