diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-03 17:54:22 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-03 17:54:49 +0100 |
| commit | dc7ee4247f3cfee6647876ba1873e0508e29ae00 (patch) | |
| tree | e11b4e776695c41a8a033e3defecd506167143ec | |
| parent | 7d712a4cd1823fed21d6cdf39b60341382fd121c (diff) | |
| download | px4-firmware-dc7ee4247f3cfee6647876ba1873e0508e29ae00.tar.gz px4-firmware-dc7ee4247f3cfee6647876ba1873e0508e29ae00.tar.bz2 px4-firmware-dc7ee4247f3cfee6647876ba1873e0508e29ae00.zip | |
HMC5883 startup: Ensure sensor configuration is always performed
| -rw-r--r-- | src/drivers/hmc5883/hmc5883.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/drivers/hmc5883/hmc5883.cpp b/src/drivers/hmc5883/hmc5883.cpp index 80b2c5f13..fe70bd37f 100644 --- a/src/drivers/hmc5883/hmc5883.cpp +++ b/src/drivers/hmc5883/hmc5883.cpp @@ -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; |