Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-23 00:05:28 +03:00
Code Issues Wiki Activity

Fix invalid values in cli error messages. Use 0 based index for 1wire,

Browse source 
now it is consistent with mmix.  Replace typo in 1wire error message
with standard cli parse error message.
This commit is contained in:
Dominic Clifton 2015-11-28 14:35:20 +00:00
parent 12157bd791
commit 0c82a7b927
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main/io/serial_cli.c
View file

@ -1102,7 +1102,7 @@ static void cliMotorMix(char *cmdline)
cliMotorMix("");
}
} else {
cliShowArgumentRangeError("index", 1, MAX_SUPPORTED_MOTORS);
cliShowArgumentRangeError("index", 0, MAX_SUPPORTED_MOTORS - 1);
}
}
#endif
@ -1935,7 +1935,7 @@ static void cliMotor(char *cmdline)
}
if (motor_index < 0 || motor_index >= MAX_SUPPORTED_MOTORS) {
cliShowArgumentRangeError("index", 0, MAX_SUPPORTED_MOTORS);
cliShowArgumentRangeError("index", 0, MAX_SUPPORTED_MOTORS - 1);
return;
}
@ -2313,20 +2313,18 @@ static void cliStatus(char *cmdline)
static void cliUSB1Wire(char *cmdline)
{
if (isEmpty(cmdline)) {
cliPrint("Please specify a ouput channel. e.g. `1wire 2` to connect to motor 2\r\n");
cliShowParseError();
return;
} else {
usb1WireInitialize();
int i;
i = atoi(cmdline);
if (i >= 0 && i <= escCount) {
if (i >= 0 && i < escCount) {
printf("Switching to BlHeli mode on motor port %d\r\n", i);
// motor 1 => index 0
usb1WirePassthrough(i-1);
}
else {
printf("Invalid motor port, valid range: 1 to %d\r\n", escCount);
usb1WirePassthrough(i);
} else {
cliShowArgumentRangeError("motor", 0, escCount - 1);
}
}
}