Fix CLI vtx command parsing, range checks, and output order in… (#9295)
Fix CLI vtx command parsing, range checks, and output order in diff
This commit is contained in:
commit
3345b56ad1
|
@ -2583,7 +2583,7 @@ static void cliVtx(char *cmdline)
|
||||||
ptr = nextArg(ptr);
|
ptr = nextArg(ptr);
|
||||||
if (ptr) {
|
if (ptr) {
|
||||||
val = atoi(ptr);
|
val = atoi(ptr);
|
||||||
if (val >= 0 && val <= vtxTableBandCount) {
|
if (val >= 0 && val <= vtxTableConfig()->bands) {
|
||||||
cac->band = val;
|
cac->band = val;
|
||||||
validArgumentCount++;
|
validArgumentCount++;
|
||||||
}
|
}
|
||||||
|
@ -2591,7 +2591,7 @@ static void cliVtx(char *cmdline)
|
||||||
ptr = nextArg(ptr);
|
ptr = nextArg(ptr);
|
||||||
if (ptr) {
|
if (ptr) {
|
||||||
val = atoi(ptr);
|
val = atoi(ptr);
|
||||||
if (val >= 0 && val <= vtxTableChannelCount) {
|
if (val >= 0 && val <= vtxTableConfig()->channels) {
|
||||||
cac->channel = val;
|
cac->channel = val;
|
||||||
validArgumentCount++;
|
validArgumentCount++;
|
||||||
}
|
}
|
||||||
|
@ -2599,7 +2599,7 @@ static void cliVtx(char *cmdline)
|
||||||
ptr = nextArg(ptr);
|
ptr = nextArg(ptr);
|
||||||
if (ptr) {
|
if (ptr) {
|
||||||
val = atoi(ptr);
|
val = atoi(ptr);
|
||||||
if (val >= 0 && val < vtxTablePowerLevels) {
|
if (val >= 0 && val <= vtxTableConfig()->powerLevels) {
|
||||||
cac->power= val;
|
cac->power= val;
|
||||||
validArgumentCount++;
|
validArgumentCount++;
|
||||||
}
|
}
|
||||||
|
@ -6099,14 +6099,14 @@ static void printConfig(char *cmdline, bool doDiff)
|
||||||
|
|
||||||
printRxRange(dumpMask, rxChannelRangeConfigs_CopyArray, rxChannelRangeConfigs(0), "rxrange");
|
printRxRange(dumpMask, rxChannelRangeConfigs_CopyArray, rxChannelRangeConfigs(0), "rxrange");
|
||||||
|
|
||||||
#ifdef USE_VTX_CONTROL
|
|
||||||
printVtx(dumpMask, &vtxConfig_Copy, vtxConfig(), "vtx");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef USE_VTX_TABLE
|
#ifdef USE_VTX_TABLE
|
||||||
printVtxTable(dumpMask, &vtxTableConfig_Copy, vtxTableConfig(), "vtxtable");
|
printVtxTable(dumpMask, &vtxTableConfig_Copy, vtxTableConfig(), "vtxtable");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef USE_VTX_CONTROL
|
||||||
|
printVtx(dumpMask, &vtxConfig_Copy, vtxConfig(), "vtx");
|
||||||
|
#endif
|
||||||
|
|
||||||
printRxFailsafe(dumpMask, rxFailsafeChannelConfigs_CopyArray, rxFailsafeChannelConfigs(0), "rxfail");
|
printRxFailsafe(dumpMask, rxFailsafeChannelConfigs_CopyArray, rxFailsafeChannelConfigs(0), "rxfail");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue