uORB: improve console output and status

This commit is contained in:
Julian Oes
2016-02-10 09:56:46 +01:00
parent adb44c2918
commit 8fd4b80eed
+9 -4
View File
@@ -45,7 +45,7 @@ extern "C" { __EXPORT int uorb_main(int argc, char *argv[]); }
static uORB::DeviceMaster *g_dev = nullptr; static uORB::DeviceMaster *g_dev = nullptr;
static void usage() 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[])
if (!strcmp(argv[1], "start")) { if (!strcmp(argv[1], "start")) {
if (g_dev != nullptr) { if (g_dev != nullptr) {
warnx("already loaded"); PX4_WARN("already loaded");
/* user wanted to start uorb, its already running, no error */ /* user wanted to start uorb, its already running, no error */
return 0; return 0;
} }
@@ -74,12 +74,12 @@ uorb_main(int argc, char *argv[])
g_dev = new uORB::DeviceMaster(uORB::PUBSUB); g_dev = new uORB::DeviceMaster(uORB::PUBSUB);
if (g_dev == nullptr) { if (g_dev == nullptr) {
warnx("driver alloc failed"); PX4_ERR("driver alloc failed");
return -ENOMEM; return -ENOMEM;
} }
if (OK != g_dev->init()) { if (OK != g_dev->init()) {
warnx("driver init failed"); PX4_ERR("driver init failed");
delete g_dev; delete g_dev;
g_dev = nullptr; g_dev = nullptr;
return -EIO; return -EIO;
@@ -122,6 +122,11 @@ uorb_main(int argc, char *argv[])
* Print driver information. * Print driver information.
*/ */
if (!strcmp(argv[1], "status")) { if (!strcmp(argv[1], "status")) {
if (g_dev != nullptr) {
PX4_INFO("uorb is running");
} else {
PX4_INFO("uorb is not running");
}
return OK; return OK;
} }