1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-24 00:35:39 +03:00

Merge pull request #9788 from nickdbate/master

This commit is contained in:
Michael Keller 2020-05-13 01:41:22 +12:00 committed by GitHub
commit be3a682756
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions

View file

@ -41,8 +41,8 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
DEF_TIM(TIM5, CH3, PA2, TIM_USE_MOTOR, 0, 2, 0 ),
DEF_TIM(TIM5, CH4, PA3, TIM_USE_MOTOR, 0, 3, 0 ), // M4
DEF_TIM(TIM4, CH1, PB6, TIM_USE_MOTOR, 0, 4, 1 ), // M5
DEF_TIM(TIM4, CH2, PB7, TIM_USE_MOTOR, 0, 5, 1 ), // M6
DEF_TIM(TIM4, CH1, PB6, TIM_USE_MOTOR, 0, 4, 1 ), // M5 / I2C4_SCL
DEF_TIM(TIM4, CH2, PB7, TIM_USE_MOTOR, 0, 5, 1 ), // M6 / I2C4_SDA
DEF_TIM(TIM8, CH1, PC6, TIM_USE_MOTOR, 0, 6, 2 ), // M7
DEF_TIM(TIM8, CH2, PC7, TIM_USE_MOTOR, 0, 7, 2 ), // M8

View file

@ -127,6 +127,10 @@
#define I2C1_SDA PB9
#define I2C_DEVICE (I2CDEV_1)
#define USE_I2C_DEVICE_4 // Shared with motor outputs 5/6
#define I2C4_SCL PB6
#define I2C4_SDA PB7
#define USE_MAG
#define USE_MAG_HMC5883
#define USE_MAG_QMC5883