Fixes for REVONANO (thanks @velez for hardware)

This commit is contained in:
blckmn 2017-01-29 09:33:39 +11:00 committed by borisbstyle
parent 1ad3d74f9f
commit ab8f045c4f
3 changed files with 15 additions and 21 deletions

View File

@ -32,33 +32,29 @@
#define INVERTER_PIN_USART2 PC15 //Sbus on USART 2 of nano. #define INVERTER_PIN_USART2 PC15 //Sbus on USART 2 of nano.
#define MPU9250_CS_PIN PB12 #define MPU6500_CS_PIN PB12
#define MPU9250_SPI_INSTANCE SPI2 #define MPU6500_SPI_INSTANCE SPI2
#define ACC #define ACC
#define USE_ACC_MPU9250 #define USE_ACC_MPU6500
#define USE_ACC_SPI_MPU9250 #define USE_ACC_SPI_MPU6500
#define ACC_MPU9250_ALIGN CW270_DEG #define ACC_MPU6500_ALIGN CW270_DEG
#define GYRO #define GYRO
#define USE_GYRO_MPU9250 #define USE_GYRO_MPU6500
#define USE_GYRO_SPI_MPU9250 #define USE_GYRO_SPI_MPU6500
#define GYRO_MPU9250_ALIGN CW270_DEG #define GYRO_MPU6500_ALIGN CW270_DEG
//#define MAG
//#define USE_MAG_HMC5883
#define BARO #define BARO
#define USE_BARO_MS5611 #define USE_BARO_MS5611
// MPU9250 interrupts // MPU6500 interrupts
#define USE_EXTI #define USE_EXTI
#define MPU_INT_EXTI PA15 #define MPU_INT_EXTI PA15
#define USE_MPU_DATA_READY_SIGNAL #define USE_MPU_DATA_READY_SIGNAL
//#define ENSURE_MPU_DATA_READY_IS_LOW
#define USE_VCP #define USE_VCP
#define VBUS_SENSING_PIN PA9 //#define VBUS_SENSING_PIN PA9
#define USE_UART1 #define USE_UART1
#define UART1_RX_PIN PB7 #define UART1_RX_PIN PB7
@ -68,15 +64,13 @@
#define UART2_RX_PIN PA3 #define UART2_RX_PIN PA3
#define UART2_TX_PIN PA2 #define UART2_TX_PIN PA2
#define SERIAL_PORT_COUNT 3 //VCP, USART1, USART2 #define SERIAL_PORT_COUNT 3
#define USE_ESCSERIAL #define USE_ESCSERIAL
#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 #define ESCSERIAL_TIMER_TX_HARDWARE 0
#define USE_SPI #define USE_SPI
//#define USE_SPI_DEVICE_1
#define USE_SPI_DEVICE_2 #define USE_SPI_DEVICE_2
//#define USE_SPI_DEVICE_3
#define USE_I2C #define USE_I2C
#define I2C_DEVICE (I2CDEV_3) #define I2C_DEVICE (I2CDEV_3)

View File

@ -2,5 +2,6 @@ F411_TARGETS += $(TARGET)
FEATURES += VCP ONBOARDFLASH FEATURES += VCP ONBOARDFLASH
TARGET_SRC = \ TARGET_SRC = \
drivers/accgyro_spi_mpu9250.c \ drivers/accgyro_mpu6500.c \
drivers/accgyro_spi_mpu6500.c \
drivers/barometer_ms5611.c drivers/barometer_ms5611.c

View File

@ -25,10 +25,9 @@ MEMORY
FLASH_CONFIG (r) : ORIGIN = 0x08060000, LENGTH = 128K FLASH_CONFIG (r) : ORIGIN = 0x08060000, LENGTH = 128K
RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 128K RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 128K
CCM (xrw) : ORIGIN = 0x10000000, LENGTH = 64K
MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K
} }
REGION_ALIAS("STACKRAM", CCM) REGION_ALIAS("STACKRAM", RAM)
INCLUDE "stm32_flash.ld" INCLUDE "stm32_flash.ld"