Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-24 16:55:36 +03:00
Code Issues Wiki Activity

Fix CLI vtx command parsing, range checks, and output order in… (#9295)

Browse source 
Fix CLI vtx command parsing, range checks, and output order in diff
This commit is contained in:
Michael Keller 2019-12-22 13:51:34 +13:00 • committed by mikeller
parent 68cdde94fc
commit 26c5a4784d
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/main/cli/cli.c
View file

@ -2574,7 +2574,7 @@ static void cliVtx(char *cmdline)
ptr = nextArg(ptr);
if (ptr) {
val = atoi(ptr);
if (val >= 0 && val <= vtxTableBandCount) {
if (val >= 0 && val <= vtxTableConfig()->bands) {
cac->band = val;
validArgumentCount++;
}
@ -2582,7 +2582,7 @@ static void cliVtx(char *cmdline)
ptr = nextArg(ptr);
if (ptr) {
val = atoi(ptr);
if (val >= 0 && val <= vtxTableChannelCount) {
if (val >= 0 && val <= vtxTableConfig()->channels) {
cac->channel = val;
validArgumentCount++;
}
@ -2590,7 +2590,7 @@ static void cliVtx(char *cmdline)
ptr = nextArg(ptr);
if (ptr) {
val = atoi(ptr);
if (val >= 0 && val < vtxTablePowerLevels) {
if (val >= 0 && val <= vtxTableConfig()->powerLevels) {
cac->power= val;
validArgumentCount++;
}
@ -6100,14 +6100,14 @@ static void printConfig(char *cmdline, bool doDiff)
printRxRange(dumpMask, rxChannelRangeConfigs_CopyArray, rxChannelRangeConfigs(0), "rxrange");
#ifdef USE_VTX_CONTROL
printVtx(dumpMask, &vtxConfig_Copy, vtxConfig(), "vtx");
#endif
#ifdef USE_VTX_TABLE
printVtxTable(dumpMask, &vtxTableConfig_Copy, vtxTableConfig(), "vtxtable");
#endif
#ifdef USE_VTX_CONTROL
printVtx(dumpMask, &vtxConfig_Copy, vtxConfig(), "vtx");
#endif
printRxFailsafe(dumpMask, rxFailsafeChannelConfigs_CopyArray, rxFailsafeChannelConfigs(0), "rxfail");
}