diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2012-08-19 14:14:55 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2012-08-19 14:14:55 +0200 |
| commit | b440b687aa2155a0ae0676236a80db9587a50190 (patch) | |
| tree | 8cb9eded12ea8b5a253f8d26e7dec967360080e4 /apps/uORB/uORB.cpp | |
| parent | 1cf92ad605f6270c76f701321059dc7fe4f91d8a (diff) | |
| parent | 2a5fcd917428fa6e549214f8066690672b453af0 (diff) | |
| download | px4-firmware-b440b687aa2155a0ae0676236a80db9587a50190.tar.gz px4-firmware-b440b687aa2155a0ae0676236a80db9587a50190.tar.bz2 px4-firmware-b440b687aa2155a0ae0676236a80db9587a50190.zip | |
Merge branch 'master' of https://github.com/PX4/Firmware
Diffstat (limited to 'apps/uORB/uORB.cpp')
| -rw-r--r-- | apps/uORB/uORB.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/uORB/uORB.cpp b/apps/uORB/uORB.cpp index 270e3861c..1e7cdc8db 100644 --- a/apps/uORB/uORB.cpp +++ b/apps/uORB/uORB.cpp @@ -728,7 +728,8 @@ uorb_main(int argc, char *argv[]) if (g_dev != nullptr) { fprintf(stderr, "[uorb] already loaded\n"); - return -EBUSY; + /* user wanted to start uorb, its already running, no error */ + return 0; } /* create the driver */ @@ -759,10 +760,10 @@ uorb_main(int argc, char *argv[]) /* * Print driver information. */ - if (!strcmp(argv[1], "info")) + if (!strcmp(argv[1], "status")) return info(); - fprintf(stderr, "unrecognised command, try 'start', 'test' or 'info'\n"); + fprintf(stderr, "unrecognised command, try 'start', 'test' or 'status'\n"); return -EINVAL; } |