mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-20 19:53:34 +08:00
sf0x: add argc check and fix argv index
This commit is contained in:
@@ -947,25 +947,27 @@ info()
|
|||||||
int
|
int
|
||||||
sf0x_main(int argc, char *argv[])
|
sf0x_main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
// check for optional arguments
|
|
||||||
int ch;
|
int ch;
|
||||||
uint8_t rotation = distance_sensor_s::ROTATION_DOWNWARD_FACING;
|
uint8_t rotation = distance_sensor_s::ROTATION_DOWNWARD_FACING;
|
||||||
int myoptind = 1;
|
int myoptind = 1;
|
||||||
const char *myoptarg = nullptr;
|
const char *myoptarg = nullptr;
|
||||||
|
|
||||||
|
|
||||||
while ((ch = px4_getopt(argc, argv, "R:", &myoptind, &myoptarg)) != EOF) {
|
while ((ch = px4_getopt(argc, argv, "R:", &myoptind, &myoptarg)) != EOF) {
|
||||||
switch (ch) {
|
switch (ch) {
|
||||||
case 'R':
|
case 'R':
|
||||||
rotation = (uint8_t)atoi(myoptarg);
|
rotation = (uint8_t)atoi(myoptarg);
|
||||||
PX4_INFO("Setting distance sensor orientation to %d", (int)rotation);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
PX4_WARN("Unknown option!");
|
PX4_WARN("Unknown option!");
|
||||||
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (myoptind >= argc) {
|
||||||
|
goto out_error;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Start/load the driver.
|
* Start/load the driver.
|
||||||
*/
|
*/
|
||||||
@@ -1002,10 +1004,11 @@ sf0x_main(int argc, char *argv[])
|
|||||||
/*
|
/*
|
||||||
* Print driver information.
|
* Print driver information.
|
||||||
*/
|
*/
|
||||||
if (!strcmp(argv[myoptind], "info") || !strcmp(argv[1], "status")) {
|
if (!strcmp(argv[myoptind], "info") || !strcmp(argv[myoptind], "status")) {
|
||||||
sf0x::info();
|
sf0x::info();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
out_error:
|
||||||
PX4_ERR("unrecognized command, try 'start', 'test', 'reset' or 'info'");
|
PX4_ERR("unrecognized command, try 'start', 'test', 'reset' or 'info'");
|
||||||
return PX4_ERROR;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user