rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support for setting uint32 vars. 

Signed-off-by: Mark Hale <mark.hale@physics.org>
This commit is contained in:
Mark Hale 2018-11-08 20:34:14 +00:00
parent 0fae0a49c5
commit 0ace402ea3
2 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/interface/cli.c
View File

@ -445,12 +445,23 @@ static void printValuePointer(const clivalue_t *var, const void *valuePointer, b
switch (var->type & VALUE_MODE_MASK) {
case MODE_DIRECT:
if ((value < var->config.minmax.min) || (value > var->config.minmax.max)) {
cliPrintCorruptMessage(value);
if ((var->type & VALUE_TYPE_MASK) == VAR_UINT32) {
if ((uint32_t) value > var->config.u32_max) {
cliPrintCorruptMessage(value);
} else {
cliPrintf("%d", value);
if (full) {
cliPrintf(" 0 %d", var->config.u32_max);
}
}
} else {
cliPrintf("%d", value);
if (full) {
cliPrintf(" %d %d", var->config.minmax.min, var->config.minmax.max);
if ((value < var->config.minmax.min) || (value > var->config.minmax.max)) {
cliPrintCorruptMessage(value);
} else {
cliPrintf("%d", value);
if (full) {
cliPrintf(" %d %d", var->config.minmax.min, var->config.minmax.max);
}
}
}
break;
@ -628,7 +639,7 @@ static void cliPrintVarRange(const clivalue_t *var)
}
}
static void cliSetVar(const clivalue_t *var, const int16_t value)
static void cliSetVar(const clivalue_t *var, const uint32_t value)
{
void *ptr = cliGetValuePointer(var);
uint32_t workValue;
@ -681,6 +692,10 @@ static void cliSetVar(const clivalue_t *var, const int16_t value)
case VAR_INT16:
*(int16_t *)ptr = value;
break;
case VAR_UINT32:
*(uint32_t *)ptr = value;
break;
}
}
}
@ -3430,11 +3445,20 @@ STATIC_UNIT_TESTED void cliSet(char *cmdline)
int16_t value = 0;
switch (val->type & VALUE_MODE_MASK) {
case MODE_DIRECT: {
int16_t value = atoi(eqptr);
if ((val->type & VALUE_TYPE_MASK) == VAR_UINT32) {
uint32_t value = strtol(eqptr, NULL, 10);
if (value >= val->config.minmax.min && value <= val->config.minmax.max) {
cliSetVar(val, value);
valueChanged = true;
if (value <= val->config.u32_max) {
cliSetVar(val, value);
valueChanged = true;
}
} else {
int16_t value = atoi(eqptr);
if (value >= val->config.minmax.min && value <= val->config.minmax.max) {
cliSetVar(val, value);
valueChanged = true;
}
}
}

9
src/main/interface/settings.h
View File

@ -178,10 +178,11 @@ typedef struct cliArrayLengthConfig_s {
} cliArrayLengthConfig_t;
typedef union {
cliLookupTableConfig_t lookup;
cliMinMaxConfig_t minmax;
cliArrayLengthConfig_t array;
uint8_t bitpos;
cliLookupTableConfig_t lookup; // used for MODE_LOOKUP excl. VAR_UINT32
cliMinMaxConfig_t minmax; // used for MODE_DIRECT
cliArrayLengthConfig_t array; // used for MODE_ARRAY
uint8_t bitpos; // used for MODE_BITSET
uint32_t u32_max; // used for MODE_DIRECT with VAR_UINT32
} cliValueConfig_t;
typedef struct clivalue_s {