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

CLI: improved invalid value message

Browse source
This commit is contained in:
theArchLadder 2016-05-12 01:17:03 +02:00
parent ea34fa4366
commit f6a03a3c00
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2291,27 +2291,30 @@ static void cliPrintVar(const clivalue_t *var, uint32_t full)
break; break;
case VAR_FLOAT: case VAR_FLOAT:
cliPrintf("%s", ftoa(*(float *)ptr, ftoaBuffer));
if (full && (var->type & VALUE_MODE_MASK) == MODE_DIRECT) { if (full && (var->type & VALUE_MODE_MASK) == MODE_DIRECT) {
cliPrintf(" %s", ftoa((float)var->config.minmax.min, ftoaBuffer)); cliPrintf("%s", ftoa((float)var->config.minmax.min, ftoaBuffer));
cliPrintf(" %s", ftoa((float)var->config.minmax.max, ftoaBuffer)); cliPrintf(" - %s", ftoa((float)var->config.minmax.max, ftoaBuffer));
} else {
cliPrintf("%s", ftoa(*(float *)ptr, ftoaBuffer));
} }
return; // return from case for float only return; // return from case for float only
} }
switch(var->type & VALUE_MODE_MASK) { switch(var->type & VALUE_MODE_MASK) {
case MODE_DIRECT: case MODE_DIRECT:
cliPrintf("%d", value);
if (full) { if (full) {
cliPrintf(" %d %d", var->config.minmax.min, var->config.minmax.max); cliPrintf("%d - %d", var->config.minmax.min, var->config.minmax.max);
} else {
cliPrintf("%d", value);
} }
break; break;
case MODE_LOOKUP: case MODE_LOOKUP:
cliPrintf(lookupTables[var->config.lookup.tableIndex].values[value]);
if (full) { if (full) {
for (int i=0; i<lookupTables[var->config.lookup.tableIndex].valueCount; i++) { for (int i=0; i<lookupTables[var->config.lookup.tableIndex].valueCount; i++) {
cliPrintf(" %s", lookupTables[var->config.lookup.tableIndex].values[i]); cliPrintf("%s ", lookupTables[var->config.lookup.tableIndex].values[i]);
} }
} else {
cliPrintf(lookupTables[var->config.lookup.tableIndex].values[value]);
} }
break; break;
} }