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

Merge pull request #8302 from mikeller/fix_uint32_t_printing

Browse source 
Fixed setting / printing of VAR_UINT32 values.
This commit is contained in:
Michael Keller 2019-05-20 19:59:10 +12:00 • committed by GitHub
commit 1c98fc58d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -508,11 +508,11 @@ static void printValuePointer(const clivalue_t *var, const void *valuePointer, b
switch (var->type & VALUE_MODE_MASK) { switch (var->type & VALUE_MODE_MASK) {
case MODE_DIRECT: case MODE_DIRECT:
if ((var->type & VALUE_TYPE_MASK) == VAR_UINT32) { if ((var->type & VALUE_TYPE_MASK) == VAR_UINT32) {
cliPrintf("%d", value); cliPrintf("%u", (uint32_t)value);
if ((uint32_t) value > var->config.u32Max) { if ((uint32_t)value > var->config.u32Max) {
valueIsCorrupted = true; valueIsCorrupted = true;
} else if (full) { } else if (full) {
cliPrintf(" 0 %d", var->config.u32Max); cliPrintf(" 0 %u", var->config.u32Max);
} }
} else { } else {
int min; int min;
@ -697,7 +697,7 @@ static void cliPrintVarRange(const clivalue_t *var)
case (MODE_DIRECT): { case (MODE_DIRECT): {
switch (var->type & VALUE_TYPE_MASK) { switch (var->type & VALUE_TYPE_MASK) {
case VAR_UINT32: case VAR_UINT32:
cliPrintLinef("Allowed range: %d - %d", 0, var->config.u32Max); cliPrintLinef("Allowed range: 0 - %u", var->config.u32Max);
break; break;
case VAR_UINT8: case VAR_UINT8:
@ -4097,7 +4097,7 @@ STATIC_UNIT_TESTED void cliSet(char *cmdline)
switch (val->type & VALUE_MODE_MASK) { switch (val->type & VALUE_MODE_MASK) {
case MODE_DIRECT: { case MODE_DIRECT: {
if ((val->type & VALUE_TYPE_MASK) == VAR_UINT32) { if ((val->type & VALUE_TYPE_MASK) == VAR_UINT32) {
uint32_t value = strtol(eqptr, NULL, 10); uint32_t value = strtoul(eqptr, NULL, 10);
if (value <= val->config.u32Max) { if (value <= val->config.u32Max) {
cliSetVar(val, value); cliSetVar(val, value);