Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-19 14:25:20 +03:00
Code Issues Wiki Activity

Merge pull request #3575 from jflyper/bfdev-revonano-i2c-def-fix

Browse source 
REVONANO Use I2C1 instead of I2C3
This commit is contained in:
jflyper 2017-07-23 03:58:12 +09:00 • committed by GitHub
commit 84fc9523aa
2 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/main/sensors/initialisation.c
View file

@ -56,12 +56,14 @@ static bool sonarDetect(void)
bool sensorsAutodetect(void) bool sensorsAutodetect(void)
{ {
// gyro must be initialised before accelerometer
if (!gyroInit()) {
return false;
}
accInit(gyro.targetLooptime); // gyro must be initialised before accelerometer
bool gyroDetected = gyroInit();
if (gyroDetected) {
accInit(gyro.targetLooptime);
}
#ifdef MAG #ifdef MAG
compassInit(); compassInit();
@ -77,5 +79,5 @@ bool sensorsAutodetect(void)
} }
#endif #endif
return true; return gyroDetected;
} }

13
src/main/target/REVONANO/target.h
View file

@ -28,8 +28,6 @@
#define BEEPER PC13 #define BEEPER PC13
#define INVERTER_PIN_UART2 PC15 //Sbus on USART 2 of nano.
#define MPU6500_CS_PIN PB12 #define MPU6500_CS_PIN PB12
#define MPU6500_SPI_INSTANCE SPI2 #define MPU6500_SPI_INSTANCE SPI2
@ -54,13 +52,14 @@
#define USE_VCP #define USE_VCP
//#define VBUS_SENSING_PIN PA9 //#define VBUS_SENSING_PIN PA9
#define USE_UART1 #define USE_UART1 // Flexi Port
#define UART1_RX_PIN PB7 #define UART1_RX_PIN PB7
#define UART1_TX_PIN PB6 #define UART1_TX_PIN PB6
#define USE_UART2 #define USE_UART2 // Main Port
#define UART2_RX_PIN PA3 #define UART2_RX_PIN PA3
#define UART2_TX_PIN PA2 #define UART2_TX_PIN PA2
#define INVERTER_PIN_UART2 PC15 //Sbus on USART 2 of nano.
#define USE_SOFTSERIAL1 #define USE_SOFTSERIAL1
#define USE_SOFTSERIAL2 #define USE_SOFTSERIAL2
@ -74,8 +73,8 @@
#define USE_SPI_DEVICE_2 #define USE_SPI_DEVICE_2
#define USE_I2C #define USE_I2C
#define USE_I2C_DEVICE_3 #define USE_I2C_DEVICE_1 // UART1/FlexiPort (PB6,PB7)
#define I2C_DEVICE (I2CDEV_3) #define I2C_DEVICE (I2CDEV_1)
#undef LED_STRIP #undef LED_STRIP
@ -86,7 +85,7 @@
#define TARGET_IO_PORTA 0xffff #define TARGET_IO_PORTA 0xffff
#define TARGET_IO_PORTB 0xffff #define TARGET_IO_PORTB 0xffff
#define TARGET_IO_PORTC 0xffff #define TARGET_IO_PORTC (BIT(13) | BIT(14) | BIT(15))
#define USABLE_TIMER_CHANNEL_COUNT 12 #define USABLE_TIMER_CHANNEL_COUNT 12
#define USED_TIMERS ( TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(5) ) #define USED_TIMERS ( TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(5) )