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

HMC5883 startup: Ensure sensor configuration is always performed

This commit is contained in:
Lorenz Meier 2015-01-03 17:54:22 +01:00
parent 7d712a4cd1
commit dc7ee4247f
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/drivers/hmc5883/hmc5883.cpp
View File

@ -1320,10 +1320,9 @@ start(int external_bus, enum Rotation rotation)
int fd;
/* create the driver, attempt expansion bus first */
if (external_bus == HMC5883_BUS_ALL || external_bus == HMC5883_BUS_EXTERNAL) {
if (g_dev_ext != nullptr) {
errx(0, "already started external");
}
if (g_dev_ext != nullptr) {
warnx("already started external");
} else if (external_bus == HMC5883_BUS_ALL || external_bus == HMC5883_BUS_EXTERNAL) {
device::Device *interface = nullptr;
@ -1364,10 +1363,9 @@ start(int external_bus, enum Rotation rotation)
/* if this failed, attempt onboard sensor */
if (external_bus == HMC5883_BUS_ALL || external_bus == HMC5883_BUS_INTERNAL) {
if (g_dev_int != nullptr) {
errx(0, "already started internal");
}
if (g_dev_int != nullptr) {
warnx("already started internal");
} else if (external_bus == HMC5883_BUS_ALL || external_bus == HMC5883_BUS_INTERNAL) {
device::Device *interface = nullptr;