projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'telescience-v0.2'
[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 083c1b6fea390f8c58e2e34746796f2fd0a443ed..4c645871fe758d6f6159da4aa49e38ef2823e936 100644
(file)
--- a/
src/megametrum-v0.1/ao_pins.h
+++ b/
src/megametrum-v0.1/ao_pins.h
@@
-76,10
+76,12
@@
#define SPI_1_PA5_PA6_PA7 1 /* Barometer */
#define SPI_1_PB3_PB4_PB5 0
#define SPI_1_PE13_PE14_PE15 1 /* Accelerometer */
#define SPI_1_PA5_PA6_PA7 1 /* Barometer */
#define SPI_1_PB3_PB4_PB5 0
#define SPI_1_PE13_PE14_PE15 1 /* Accelerometer */
+#define SPI_1_OSPEEDR STM_OSPEEDR_10MHz
#define HAS_SPI_2 1
#define SPI_2_PB13_PB14_PB15 1 /* Flash, Companion */
#define SPI_2_PD1_PD3_PD4 0
#define HAS_SPI_2 1
#define SPI_2_PB13_PB14_PB15 1 /* Flash, Companion */
#define SPI_2_PD1_PD3_PD4 0
+#define SPI_2_OSPEEDR STM_OSPEEDR_10MHz
#define SPI_2_PORT (&stm_gpiob)
#define SPI_2_SCK_PIN 13
#define SPI_2_PORT (&stm_gpiob)
#define SPI_2_SCK_PIN 13
@@
-281,12
+283,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_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 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)
/*
* Mag sensor (hmc5883)