Merge pull request #2556 from mikeller/updates_from_cleanflight

Updates from cleanflight
This commit is contained in:
Michael Keller 2017-03-05 15:04:35 +13:00 committed by GitHub
commit 1611ab9421
2 changed files with 8 additions and 6 deletions

View File

@ -24,9 +24,14 @@
#define ICM20602_WHO_AM_I_CONST (0x12)
#define MPU6500_BIT_RESET (0x80)
#define MPU6500_BIT_INT_ANYRD_2CLEAR (1 << 4)
#define MPU6500_BIT_BYPASS_EN (1 << 0)
#define MPU6500_BIT_I2C_IF_DIS (1 << 4)
// Register 0x37/55 - INT_PIN_CFG / Pin Bypass Enable Configuration
#define MPU6500_BIT_RESERVED 1 << 0
#define MPU6500_BIT_BYPASS_EN 1 << 1
#define MPU6500_BIT_INT_ANYRD_2CLEAR 1 << 4
// Register 0x6a/106 - USER_CTRL / User Control
#define MPU6500_BIT_I2C_IF_DIS 1 << 4
#define MPU6500_BIT_RAW_RDY_EN (0x01)
bool mpu6500AccDetect(accDev_t *acc);

View File

@ -77,9 +77,6 @@
#define USE_ESCSERIAL
#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1
#undef USE_SOFTSERIAL1
#undef USE_SOFTSERIAL2
#define UART1_TX_PIN PA9
#define UART1_RX_PIN PA10