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

Disable bmp085 interrupt if no baro

Browse source
This commit is contained in:
Steveis 2015-05-04 13:00:43 +01:00
parent 14a95a3f18
commit 3fdbe68ee1
1 changed files with 27 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main/drivers/barometer_bmp085.c
View file

@ -154,11 +154,6 @@ bool bmp085Detect(const bmp085Config_t *config, baro_t *baro)
if (bmp085InitDone) if (bmp085InitDone)
return true; return true;
delay(20); // datasheet says 10ms, we'll be careful and do 20.
ack = i2cRead(BMP085_I2C_ADDR, BMP085_CHIP_ID__REG, 1, &data); /* read Chip Id */
if(!ack)
return false;
#if defined(BARO_XCLR_GPIO) && defined(BARO_EOC_GPIO) #if defined(BARO_XCLR_GPIO) && defined(BARO_EOC_GPIO)
if (config) { if (config) {
EXTI_InitTypeDef EXTI_InitStructure; EXTI_InitTypeDef EXTI_InitStructure;
@ -193,6 +188,10 @@ bool bmp085Detect(const bmp085Config_t *config, baro_t *baro)
UNUSED(config); UNUSED(config);
#endif #endif
delay(20); // datasheet says 10ms, we'll be careful and do 20.
ack = i2cRead(BMP085_I2C_ADDR, BMP085_CHIP_ID__REG, 1, &data); /* read Chip Id */
if (ack) {
bmp085.chip_id = BMP085_GET_BITSLICE(data, BMP085_CHIP_ID); bmp085.chip_id = BMP085_GET_BITSLICE(data, BMP085_CHIP_ID);
bmp085.oversampling_setting = 3; bmp085.oversampling_setting = 3;
@ -211,8 +210,15 @@ bool bmp085Detect(const bmp085Config_t *config, baro_t *baro)
baro->calculate = bmp085_calculate; baro->calculate = bmp085_calculate;
return true; return true;
} }
}
#ifdef BARO_EOC_GPIO #ifdef BARO_EOC_GPIO
EXTI_InitTypeDef EXTI_InitStructure;
// Disable EXTI interrupt for barometer EOC
EXTI_InitStructure.EXTI_Line = EXTI_Line14;
EXTI_InitStructure.EXTI_LineCmd = DISABLE;
EXTI_Init(&EXTI_InitStructure);
unregisterExti15_10_CallbackHandler(BMP085_EOC_EXTI_Handler); unregisterExti15_10_CallbackHandler(BMP085_EOC_EXTI_Handler);
#endif #endif