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

better array support (uint8_t, int8_t, uint16_t, int16_t) and better parser

Browse source
This commit is contained in:
fishpepper 2017-07-14 19:03:19 +02:00
parent 6fe956dea0
commit 7f47144b1a
1 changed files with 88 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

122
src/main/fc/cli.c
View file

@ -302,9 +302,36 @@ static void printValuePointer(const clivalue_t *var, const void *valuePointer, b
{ {
if ((var->type & VALUE_MODE_MASK) == MODE_ARRAY) { if ((var->type & VALUE_MODE_MASK) == MODE_ARRAY) {
for (int i = 0; i < var->config.array.length; i++) { for (int i = 0; i < var->config.array.length; i++) {
uint8_t value = ((uint8_t *)valuePointer)[i]; switch (var->type & VALUE_TYPE_MASK) {
default:
case(VAR_UINT8): {
// fetch data
uint8_t value = ((uint8_t *)valuePointer)[i];
cliPrintf("%d", value);
}
break;
cliPrintf("%d", value); case(VAR_INT8): {
// fetch data
int8_t value = ((int8_t *)valuePointer)[i];
cliPrintf("%d", value);
}
break;
case(VAR_UINT16): {
// fetch data
uint16_t value = ((uint16_t *)valuePointer)[i];
cliPrintf("%d", value);
}
break;
case(VAR_INT16): {
// fetch data
int16_t value = ((int16_t *)valuePointer)[i];
cliPrintf("%d", value);
}
break;
}
if (i < var->config.array.length - 1) { if (i < var->config.array.length - 1) {
cliPrint(","); cliPrint(",");
} }
@ -375,7 +402,7 @@ static uint16_t getValueOffset(const clivalue_t *value)
return 0; return 0;
} }
static void *getValuePointer(const clivalue_t *value) STATIC_UNIT_TESTED void *getValuePointer(const clivalue_t *value)
{ {
const pgRegistry_t* rec = pgFind(value->pgn); const pgRegistry_t* rec = pgFind(value->pgn);
return CONST_CAST(void *, rec->address + getValueOffset(value)); return CONST_CAST(void *, rec->address + getValueOffset(value));
@ -2627,7 +2654,7 @@ static void cliDefaults(char *cmdline)
cliReboot(); cliReboot();
} }
static void cliGet(char *cmdline) STATIC_UNIT_TESTED void cliGet(char *cmdline)
{ {
const clivalue_t *val; const clivalue_t *val;
int matchedCommands = 0; int matchedCommands = 0;
@ -2671,7 +2698,7 @@ static uint8_t getWordLength(char *bufBegin, char *bufEnd)
return bufEnd - bufBegin; return bufEnd - bufBegin;
} }
static void cliSet(char *cmdline) STATIC_UNIT_TESTED void cliSet(char *cmdline)
{ {
const uint32_t len = strlen(cmdline); const uint32_t len = strlen(cmdline);
char *eqptr; char *eqptr;
@ -2696,16 +2723,17 @@ static void cliSet(char *cmdline)
for (uint32_t i = 0; i < valueTableEntryCount; i++) { for (uint32_t i = 0; i < valueTableEntryCount; i++) {
const clivalue_t *val = &valueTable[i]; const clivalue_t *val = &valueTable[i];
// ensure exact match when setting to prevent setting variables with shorter names // ensure exact match when setting to prevent setting variables with shorter names
if (strncasecmp(cmdline, valueTable[i].name, strlen(valueTable[i].name)) == 0 && variableNameLength == strlen(valueTable[i].name)) { if (strncasecmp(cmdline, val->name, strlen(val->name)) == 0 && variableNameLength == strlen(val->name)) {
bool valueChanged = false; bool valueChanged = false;
int16_t value = 0; int16_t value = 0;
switch (valueTable[i].type & VALUE_MODE_MASK) { switch (val->type & VALUE_MODE_MASK) {
case MODE_DIRECT: { case MODE_DIRECT: {
int16_t value = atoi(eqptr); int16_t value = atoi(eqptr);
if (value >= valueTable[i].config.minmax.min && value <= valueTable[i].config.minmax.max) { if (value >= val->config.minmax.min && value <= val->config.minmax.max) {
cliSetVar(val, value); cliSetVar(val, value);
valueChanged = true; valueChanged = true;
} }
@ -2713,7 +2741,7 @@ static void cliSet(char *cmdline)
break; break;
case MODE_LOOKUP: { case MODE_LOOKUP: {
const lookupTableEntry_t *tableEntry = &lookupTables[valueTable[i].config.lookup.tableIndex]; const lookupTableEntry_t *tableEntry = &lookupTables[val->config.lookup.tableIndex];
bool matched = false; bool matched = false;
for (uint32_t tableValueIndex = 0; tableValueIndex < tableEntry->valueCount && !matched; tableValueIndex++) { for (uint32_t tableValueIndex = 0; tableValueIndex < tableEntry->valueCount && !matched; tableValueIndex++) {
matched = strcasecmp(tableEntry->values[tableValueIndex], eqptr) == 0; matched = strcasecmp(tableEntry->values[tableValueIndex], eqptr) == 0;
@ -2729,41 +2757,67 @@ static void cliSet(char *cmdline)
break; break;
case MODE_ARRAY: { case MODE_ARRAY: {
const uint8_t arrayLength = valueTable[i].config.array.length; const uint8_t arrayLength = val->config.array.length;
char *valPtr = eqptr; char *valPtr = eqptr;
uint8_t array[256];
char curVal[4];
for (int i = 0; i < arrayLength; i++) {
valPtr = skipSpace(valPtr);
char *valEnd = strstr(valPtr, ",");
if ((valEnd != NULL) && (i < arrayLength - 1)) {
uint8_t varLength = getWordLength(valPtr, valEnd);
if (varLength <= 3) {
strncpy(curVal, valPtr, getWordLength(valPtr, valEnd));
curVal[varLength] = '\0';
array[i] = (uint8_t)atoi((const char *)curVal);
valPtr = valEnd + 1;
} else {
break;
}
} else if ((valEnd == NULL) && (i == arrayLength - 1)) {
array[i] = atoi(valPtr);
uint8_t *ptr = getValuePointer(val); for (int i = 0; i < arrayLength; i++) {
memcpy(ptr, array, arrayLength); // skip spaces
valPtr = skipSpace(valPtr);
// find next comma (or end of string)
char *valEndPtr = strchr(valPtr, ',');
// comma found or last item?
if ((valEndPtr != NULL) || (i == arrayLength - 1)){
// process substring [valPtr, valEndPtr[
// note: no need to copy substrings for atoi()
// it stops at the first character that cannot be converted...
switch (val->type & VALUE_TYPE_MASK) {
default:
case(VAR_UINT8): {
// fetch data pointer
uint8_t *data = (uint8_t *)getValuePointer(val) + i;
// store value
*data = (uint8_t)atoi((const char*) valPtr);
}
break;
case(VAR_INT8): {
// fetch data pointer
int8_t *data = (int8_t *)getValuePointer(val) + i;
// store value
*data = (int8_t)atoi((const char*) valPtr);
}
break;
case(VAR_UINT16): {
// fetch data pointer
uint16_t *data = (uint16_t *)getValuePointer(val) + i;
// store value
*data = (uint16_t)atoi((const char*) valPtr);
}
break;
case(VAR_INT16): {
// fetch data pointer
int16_t *data = (int16_t *)getValuePointer(val) + i;
// store value
*data = (int16_t)atoi((const char*) valPtr);
}
break;
}
// mark as changed
valueChanged = true; valueChanged = true;
} else {
break; // prepare to parse next item
valPtr = valEndPtr + 1;
} }
} }
} }
break; break;
} }
if (valueChanged) { if (valueChanged) {
cliPrintf("%s set to ", valueTable[i].name); cliPrintf("%s set to ", val->name);
cliPrintVar(val, 0); cliPrintVar(val, 0);
} else { } else {
cliPrintLine("Invalid value"); cliPrintLine("Invalid value");