Browse Source

uORB: improve console output and status

sbg
Julian Oes 9 years ago
parent
commit
8fd4b80eed
  1. 13
      src/modules/uORB/uORBMain.cpp

13
src/modules/uORB/uORBMain.cpp

@ -45,7 +45,7 @@ extern "C" { __EXPORT int uorb_main(int argc, char *argv[]); } @@ -45,7 +45,7 @@ extern "C" { __EXPORT int uorb_main(int argc, char *argv[]); }
static uORB::DeviceMaster *g_dev = nullptr;
static void usage()
{
warnx("Usage: uorb 'start', 'test', 'latency_test' or 'status'");
PX4_INFO("Usage: uorb 'start', 'test', 'latency_test' or 'status'");
}
@ -65,7 +65,7 @@ uorb_main(int argc, char *argv[]) @@ -65,7 +65,7 @@ uorb_main(int argc, char *argv[])
if (!strcmp(argv[1], "start")) {
if (g_dev != nullptr) {
warnx("already loaded");
PX4_WARN("already loaded");
/* user wanted to start uorb, its already running, no error */
return 0;
}
@ -74,12 +74,12 @@ uorb_main(int argc, char *argv[]) @@ -74,12 +74,12 @@ uorb_main(int argc, char *argv[])
g_dev = new uORB::DeviceMaster(uORB::PUBSUB);
if (g_dev == nullptr) {
warnx("driver alloc failed");
PX4_ERR("driver alloc failed");
return -ENOMEM;
}
if (OK != g_dev->init()) {
warnx("driver init failed");
PX4_ERR("driver init failed");
delete g_dev;
g_dev = nullptr;
return -EIO;
@ -122,6 +122,11 @@ uorb_main(int argc, char *argv[]) @@ -122,6 +122,11 @@ uorb_main(int argc, char *argv[])
* Print driver information.
*/
if (!strcmp(argv[1], "status")) {
if (g_dev != nullptr) {
PX4_INFO("uorb is running");
} else {
PX4_INFO("uorb is not running");
}
return OK;
}

Loading…
Cancel
Save