fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-29 15:23:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

HMC5883: Better status reporting

Browse Source
This commit is contained in:
Lorenz Meier
2014-11-26 18:22:18 +01:00
parent 2a9a649adb
commit 9d986f5df3
1 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/hmc5883/hmc5883.cpp
+29 -10
View File
@@ -1349,7 +1349,7 @@ HMC5883 *g_dev_ext = nullptr;
void start(int bus, enum Rotation rotation); void start(int bus, enum Rotation rotation);
void test(int bus); void test(int bus);
void reset(int bus); void reset(int bus);
void info(int bus); int info(int bus);
int calibrate(int bus); int calibrate(int bus);
void usage(); void usage();
@@ -1595,17 +1595,23 @@ reset(int bus)
/** /**
* Print a little info about the driver. * Print a little info about the driver.
*/ */
void int
info(int bus) info(int bus)
{ {
HMC5883 *g_dev = (bus == PX4_I2C_BUS_ONBOARD?g_dev_int:g_dev_ext); int ret = 1;
if (g_dev == nullptr)
errx(1, "driver not running");
printf("state @ %p\n", g_dev); HMC5883 *g_dev = (bus == PX4_I2C_BUS_ONBOARD ? g_dev_int : g_dev_ext);
g_dev->print_info(); if (g_dev == nullptr) {
warnx("not running on bus %d", bus);
} else {
exit(0); warnx("running on bus: %d (%s)\n", bus, ((PX4_I2C_BUS_ONBOARD) ? "onboard" : "offboard"));
g_dev->print_info();
ret = 0;
}
return ret;
} }
void void
@@ -1685,8 +1691,21 @@ hmc5883_main(int argc, char *argv[])
/* /*
* Print driver information. * Print driver information.
*/ */
if (!strcmp(verb, "info") || !strcmp(verb, "status")) if (!strcmp(verb, "info") || !strcmp(verb, "status")) {
hmc5883::info(bus); if (bus == -1) {
int ret = 0;
if (hmc5883::info(PX4_I2C_BUS_ONBOARD)) {
ret = 1;
}
if (hmc5883::info(PX4_I2C_BUS_EXPANSION)) {
ret = 1;
}
exit(ret);
} else {
exit(hmc5883::info(bus));
}
}
/* /*
* Autocalibrate the scaling * Autocalibrate the scaling