rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7154 from mikeller/fix_bmi160_gyro 

Fixed build dependency on EXTI for BMI160 driver.
This commit is contained in:
Michael Keller 2018-12-03 21:32:56 +13:00 committed by GitHub
parent 3736a2486d ca5da2fdbb
commit ec7204e4a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/drivers/accgyro/accgyro_spi_bmi160.c
View File

@ -84,8 +84,6 @@
///* Global Variables */ ///* Global Variables */
static volatile bool BMI160InitDone = false; static volatile bool BMI160InitDone = false;
static volatile bool BMI160Detected = false; static volatile bool BMI160Detected = false;
static volatile bool bmi160DataReady = false;
static volatile bool bmi160ExtiInitDone = false;
//! Private functions //! Private functions
static int32_t BMI160_Config(const busDevice_t *bus); static int32_t BMI160_Config(const busDevice_t *bus);
@ -237,6 +235,7 @@ static int32_t BMI160_do_foc(const busDevice_t *bus)
extiCallbackRec_t bmi160IntCallbackRec; extiCallbackRec_t bmi160IntCallbackRec;
#if defined(USE_MPU_DATA_READY_SIGNAL)
void bmi160ExtiHandler(extiCallbackRec_t *cb) void bmi160ExtiHandler(extiCallbackRec_t *cb)
{ {
gyroDev_t *gyro = container_of(cb, gyroDev_t, exti); gyroDev_t *gyro = container_of(cb, gyroDev_t, exti);
@ -256,7 +255,7 @@ static void bmi160IntExtiInit(gyroDev_t *gyro)
EXTIConfig(mpuIntIO, &gyro->exti, NVIC_PRIO_MPU_INT_EXTI, IOCFG_IN_FLOATING, EXTI_TRIGGER_RISING); // TODO - maybe pullup / pulldown ? EXTIConfig(mpuIntIO, &gyro->exti, NVIC_PRIO_MPU_INT_EXTI, IOCFG_IN_FLOATING, EXTI_TRIGGER_RISING); // TODO - maybe pullup / pulldown ?
EXTIEnable(mpuIntIO, true); EXTIEnable(mpuIntIO, true);
} }
#endif
bool bmi160AccRead(accDev_t *acc) bool bmi160AccRead(accDev_t *acc)
{ {
@ -317,7 +316,9 @@ bool bmi160GyroRead(gyroDev_t *gyro)
void bmi160SpiGyroInit(gyroDev_t *gyro) void bmi160SpiGyroInit(gyroDev_t *gyro)
{ {
BMI160_Init(&gyro->bus); BMI160_Init(&gyro->bus);
#if defined(USE_MPU_DATA_READY_SIGNAL)
bmi160IntExtiInit(gyro); bmi160IntExtiInit(gyro);
#endif
} }
void bmi160SpiAccInit(accDev_t *acc) void bmi160SpiAccInit(accDev_t *acc)