From d2c98a98e9033b06ebacdee07eb8015a9a652c17 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Sun, 10 Apr 2016 11:18:05 -0700 Subject: [PATCH] Rename stop-all to stop for MAVLink, but still keep stop-all for existing scripts --- src/modules/mavlink/mavlink_main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp index 24e7ddc0bf..68696fb778 100644 --- a/src/modules/mavlink/mavlink_main.cpp +++ b/src/modules/mavlink/mavlink_main.cpp @@ -2398,7 +2398,7 @@ Mavlink::stream_command(int argc, char *argv[]) static void usage() { - warnx("usage: mavlink {start|stop-all|stream} [-d device] [-u network_port] [-o remote_port] [-t partner_ip] [-b baudrate]\n\t[-r rate][-m mode] [-s stream] [-f] [-p] [-v] [-w] [-x]"); + warnx("usage: mavlink {start|stop|stream} [-d device] [-u network_port] [-o remote_port] [-t partner_ip] [-b baudrate]\n\t[-r rate][-m mode] [-s stream] [-f] [-p] [-v] [-w] [-x]"); } int mavlink_main(int argc, char *argv[]) @@ -2416,7 +2416,7 @@ int mavlink_main(int argc, char *argv[]) usage(); return 1; - } else if (!strcmp(argv[1], "stop-all")) { + } else if (!strcmp(argv[1], "stop") || !strcmp(argv[1], "stop-all") ) { return Mavlink::destroy_all_instances(); } else if (!strcmp(argv[1], "status")) {