fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

bmm150: add argc check and use px4_getopt

Browse Source
This commit is contained in:
Beat Küng 2018-06-04 14:31:02 +02:00 committed by Lorenz Meier
parent 009b2d4d6b
commit ffccba12e2
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/drivers/magnetometer/bmm150/bmm150.cpp
View File

@ -37,6 +37,7 @@
*/
#include "bmm150.hpp"
#include <px4_getopt.h>
/** driver 'main' command */
extern "C" { __EXPORT int bmm150_main(int argc, char *argv[]); }
@ -1128,28 +1129,34 @@ BMM150::print_registers()
int
bmm150_main(int argc, char *argv[])
{
bool external_bus = false;
int myoptind = 1;
int ch;
const char *myoptarg = nullptr;
bool external_bus = false;
enum Rotation rotation = ROTATION_NONE;
/* jump over start/off/etc and look at options first */
while ((ch = getopt(argc, argv, "XR:")) != EOF) {
while ((ch = px4_getopt(argc, argv, "XR:", &myoptind, &myoptarg)) != EOF) {
switch (ch) {
case 'X':
external_bus = true;
break;
case 'R':
rotation = (enum Rotation)atoi(optarg);
rotation = (enum Rotation)atoi(myoptarg);
break;
default:
bmm150::usage();
exit(0);
return 0;
}
}
const char *verb = argv[optind];
if (myoptind >= argc) {
bmm150::usage();
return -1;
}
const char *verb = argv[myoptind];
/*
* Start/load the driver.
@ -1189,5 +1196,5 @@ bmm150_main(int argc, char *argv[])
bmm150::usage();
exit(1);
return -1;
}

1
src/drivers/magnetometer/bmm150/bmm150.hpp
View File

@ -16,7 +16,6 @@
#include <stdio.h>
#include <math.h>
#include <unistd.h>
#include <getopt.h>
#include <px4_log.h>
#include <perf/perf_counter.h>