aboutsummaryrefslogtreecommitdiff
path: root/src/modules/mavlink/mavlink_main.cpp
diff options
context:
space:
mode:
authorJulian Oes <julian@oes.ch>2014-02-14 14:24:26 +0100
committerJulian Oes <julian@oes.ch>2014-02-14 14:24:26 +0100
commit71cd1326635bead6c788b8967c6d5bcfd920b49c (patch)
treef314bf9599d1ff9d80dcb7ab54cf43c9516531f7 /src/modules/mavlink/mavlink_main.cpp
parent523637e0f1fb0247111818d0a88ce8c4574728ba (diff)
downloadpx4-firmware-71cd1326635bead6c788b8967c6d5bcfd920b49c.tar.gz
px4-firmware-71cd1326635bead6c788b8967c6d5bcfd920b49c.tar.bz2
px4-firmware-71cd1326635bead6c788b8967c6d5bcfd920b49c.zip
Mavlink: Don't support mavlink stop so that QGC doesn't stop mavlink before it starts rc.usb
Diffstat (limited to 'src/modules/mavlink/mavlink_main.cpp')
-rw-r--r--src/modules/mavlink/mavlink_main.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp
index 79aa6135b..d2c94ca92 100644
--- a/src/modules/mavlink/mavlink_main.cpp
+++ b/src/modules/mavlink/mavlink_main.cpp
@@ -1842,7 +1842,7 @@ Mavlink::status()
static void usage()
{
- errx(1, "usage: mavlink {start|stop|status} [-d device] [-b baudrate] [-o]");
+ errx(1, "usage: mavlink {start|stop-all} [-d device] [-b baudrate] [-o]");
}
int mavlink_main(int argc, char *argv[])
@@ -1892,6 +1892,10 @@ int mavlink_main(int argc, char *argv[])
return 0;
} else if (!strcmp(argv[1], "stop")) {
+ warnx("mavlink stop is deprecated, use stop-all instead");
+ usage();
+
+ } else if (!strcmp(argv[1], "stop-all")) {
return Mavlink::destroy_all_instances();
// } else if (!strcmp(argv[1], "status")) {