projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'mjb/altosdroid'
[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 2c438f6c9f53dba8f82a6ce4244fbdb49c370b42..5ae80ac518a61cb61230011a98baee55383082b3 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_TASK_QUEUE 1
+
/* 8MHz High speed external crystal */
#define AO_HSE 8000000
/* 8MHz High speed external crystal */
#define AO_HSE 8000000
@@
-69,17
+71,18
@@
#define HAS_TELEMETRY 1
#define HAS_SPI_1 1
#define HAS_TELEMETRY 1
#define HAS_SPI_1 1
-#define SPI_1_PA5_PA6_PA7 1
+#define SPI_1_PA5_PA6_PA7 1
/* Barometer */
#define SPI_1_PB3_PB4_PB5 0
#define SPI_1_PB3_PB4_PB5 0
-#define SPI_1_PE13_PE14_PE15
0
+#define SPI_1_PE13_PE14_PE15
1 /* Accelerometer */
#define HAS_SPI_2 1
#define HAS_SPI_2 1
-#define SPI_2_PB13_PB14_PB15 1
+#define SPI_2_PB13_PB14_PB15 1
/* Flash, Companion */
#define SPI_2_PD1_PD3_PD4 0
#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
@@
-104,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
/*
@@
-247,13
+248,15
@@
struct ao_adc {
* Pressure sensor settings
*/
#define HAS_MS5607 1
* Pressure sensor settings
*/
#define HAS_MS5607 1
-#define AO_MS5607_CS_GPIO (&stm_gpioc)
-#define AO_MS5607_CS 4
+#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)
#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_MISO_MASK (1 << AO_MS5607_MISO)
-#define AO_MS5607_SPI_INDEX
(STM_SPI_INDEX(1))
+#define AO_MS5607_SPI_INDEX
AO_SPI_1_PA5_PA6_PA7
/*
* SPI Flash memory
/*
* SPI Flash memory
@@
-262,16
+265,20
@@
struct ao_adc {
#define M25_MAX_CHIPS 1
#define AO_M25_SPI_CS_PORT (&stm_gpiod)
#define AO_M25_SPI_CS_MASK (1 << 3)
#define M25_MAX_CHIPS 1
#define AO_M25_SPI_CS_PORT (&stm_gpiod)
#define AO_M25_SPI_CS_MASK (1 << 3)
-#define AO_M25_SPI_BUS
STM_SPI_INDEX(2)
+#define AO_M25_SPI_BUS
AO_SPI_2_PB13_PB14_PB15
/*
* Radio (cc1120)
*/
/*
* Radio (cc1120)
*/
+/* gets pretty close to 434.550 */
+
+#define AO_RADIO_CAL_DEFAULT 0x6ca333
+
#define AO_FEC_DEBUG 0
#define AO_CC1120_SPI_CS_PORT (&stm_gpioc)
#define AO_CC1120_SPI_CS_PIN 5
#define AO_FEC_DEBUG 0
#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_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
@@
-299,6
+306,15
@@
struct ao_adc {
#define HAS_HIGHG_ACCEL 0
#define HAS_HIGHG_ACCEL 0
+/*
+ * mma655x
+ */
+
+#define HAS_MMA655X 1
+#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
/*
#define NUM_CMDS 16
/*
@@
-307,7
+323,7
@@
struct ao_adc {
#define AO_COMPANION_CS_PORT (&stm_gpiod)
#define AO_COMPANION_CS_PIN (0)
#define AO_COMPANION_CS_PORT (&stm_gpiod)
#define AO_COMPANION_CS_PIN (0)
-#define AO_COMPANION_SPI_BUS
STM_SPI_INDEX(2)
+#define AO_COMPANION_SPI_BUS
AO_SPI_2_PB13_PB14_PB15
/*
* Monitor
/*
* Monitor