dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'px4dev_new_driver' of github.com:PX4/Firmware into px4dev_new_driver

This commit is contained in:
Lorenz Meier 2012-08-25 20:42:05 +02:00
parent 656596896a 0dc0a0539d
commit 731621a309
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/drivers/hmc5883/hmc5883.cpp
View File

@ -339,12 +339,14 @@ HMC5883::close_last(struct file *filp)
int
HMC5883::probe()
{
uint8_t data[3];
uint8_t data[3] = {0, 0, 0};
_retries = 3;
if (read_reg(ADDR_ID_A, data[0]) ||
read_reg(ADDR_ID_B, data[1]) ||
read_reg(ADDR_ID_C, data[2]))
debug("read_reg fail");
_retries = 1;
if ((data[0] != ID_A_WHO_AM_I) ||
(data[1] != ID_B_WHO_AM_I) ||

9
apps/drivers/ms5611/ms5611.cpp
View File

@ -317,11 +317,12 @@ MS5611::close_last(struct file *filp)
int
MS5611::probe()
{
if (OK == probe_address(MS5611_ADDRESS_1))
return OK;
if (OK == probe_address(MS5611_ADDRESS_2))
_retries = 3;
if((OK == probe_address(MS5611_ADDRESS_1)) ||
(OK == probe_address(MS5611_ADDRESS_2))) {
_retries = 1;
return OK;
}
return -EIO;
}