projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: Document how to get TeleMini to 'emergency recovery' mode
[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 f6b49dd0578b60675b11d81f3b18b1034fca48f1..4c645871fe758d6f6159da4aa49e38ef2823e936 100644
(file)
--- a/
src/megametrum-v0.1/ao_pins.h
+++ b/
src/megametrum-v0.1/ao_pins.h
@@
-18,7
+18,7
@@
#ifndef _AO_PINS_H_
#define _AO_PINS_H_
#ifndef _AO_PINS_H_
#define _AO_PINS_H_
-#define HAS_
MS5611
1
+#define HAS_
TASK_QUEUE
1
/* 8MHz High speed external crystal */
#define AO_HSE 8000000
/* 8MHz High speed external crystal */
#define AO_HSE 8000000
@@
-62,6
+62,7
@@
#define ao_gps_getchar ao_serial3_getchar
#define ao_gps_putchar ao_serial3_putchar
#define ao_gps_set_speed ao_serial3_set_speed
#define ao_gps_getchar ao_serial3_getchar
#define ao_gps_putchar ao_serial3_putchar
#define ao_gps_set_speed ao_serial3_set_speed
+#define ao_gps_fifo (ao_stm_usart3.rx_fifo)
#define HAS_EEPROM 1
#define USE_INTERNAL_FLASH 0
#define HAS_EEPROM 1
#define USE_INTERNAL_FLASH 0
@@
-69,15
+70,18
@@
#define HAS_BEEP 1
#define HAS_RADIO 1
#define HAS_TELEMETRY 1
#define HAS_BEEP 1
#define HAS_RADIO 1
#define HAS_TELEMETRY 1
+#define HAS_APRS 1
#define HAS_SPI_1 1
#define SPI_1_PA5_PA6_PA7 1 /* Barometer */
#define SPI_1_PB3_PB4_PB5 0
#define SPI_1_PE13_PE14_PE15 1 /* Accelerometer */
#define HAS_SPI_1 1
#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
@@
-107,8
+111,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
/*
@@
-250,6
+252,7
@@
struct ao_adc {
* Pressure sensor settings
*/
#define HAS_MS5607 1
* Pressure sensor settings
*/
#define HAS_MS5607 1
+#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_PRIVATE_PINS 1
#define AO_MS5607_CS_PORT (&stm_gpioc)
#define AO_MS5607_CS_PIN 4
@@
-280,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)