fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-06 07:41:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

No joy with getopt_long

Browse Source
This commit is contained in:
px4dev
2012-10-14 23:09:48 -07:00
parent cf6e763c58
commit ae29617543
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/mavlink/mavlink.c
+8 -13
View File
@@ -62,7 +62,6 @@
#include <systemlib/param/param.h> #include <systemlib/param/param.h>
#include <systemlib/systemlib.h> #include <systemlib/systemlib.h>
#include <systemlib/err.h> #include <systemlib/err.h>
#include <systemlib/getopt_long.h>
#include "waypoints.h" #include "waypoints.h"
#include "mavlink_log.h" #include "mavlink_log.h"
@@ -490,19 +489,15 @@ void mavlink_update_system(void)
*/ */
int mavlink_thread_main(int argc, char *argv[]) int mavlink_thread_main(int argc, char *argv[])
{ {
static GETOPT_LONG_OPTION_T options[] = { int ch;
{"baud", REQUIRED_ARG, NULL, 'b'},
{"speed", REQUIRED_ARG, NULL, 'b'},
{"device", REQUIRED_ARG, NULL, 'd'},
{"exit-allowed", NO_ARG, NULL, 'e'},
{"onboard", NO_ARG, NULL, 'o'}
};
int ch, longind;
char *device_name = "/dev/ttyS1"; char *device_name = "/dev/ttyS1";
baudrate = 57600; baudrate = 57600;
while ((ch = getopt_long(argc, argv, "b:d:eo", options, &longind)) != EOF) { /* work around some stupidity in task_create's argv handling */
argc -= 2;
argv += 2;
while ((ch = getopt(argc, argv, "b:d:eo")) != EOF) {
switch (ch) { switch (ch) {
case 'b': case 'b':
baudrate = strtoul(optarg, NULL, 10); baudrate = strtoul(optarg, NULL, 10);
@@ -692,7 +687,7 @@ int mavlink_thread_main(int argc, char *argv[])
static void static void
usage() usage()
{ {
fprintf(stderr, "usage: mavlink start [--device <devicename>] [--speed <device speed>] [--exit-allowed] [--onboard]\n" fprintf(stderr, "usage: mavlink start [-d <devicename>] [-b <baud rate>] [-e] [-o]\n"
" mavlink stop\n" " mavlink stop\n"
" mavlink status\n"); " mavlink status\n");
exit(1); exit(1);
@@ -716,7 +711,7 @@ int mavlink_main(int argc, char *argv[])
SCHED_PRIORITY_DEFAULT, SCHED_PRIORITY_DEFAULT,
6000, 6000,
mavlink_thread_main, mavlink_thread_main,
NULL); argv);
exit(0); exit(0);
} }