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

Merge pull request #7595 from dthubereng/aux_cli_linkedto_fix

Browse source 
Fixed cliAux acknowledge to show permanentId's
This commit is contained in:
Michael Keller 2019-02-19 00:09:14 +13:00 • committed by GitHub
commit e5e45faa9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1025,6 +1025,7 @@ static void cliAux(char *cmdline)
} }
if (validArgumentCount == 4) { // for backwards compatibility if (validArgumentCount == 4) { // for backwards compatibility
mac->modeLogic = MODELOGIC_OR; mac->modeLogic = MODELOGIC_OR;
mac->linkedTo = 0;
} else if (validArgumentCount == 5) { // for backwards compatibility } else if (validArgumentCount == 5) { // for backwards compatibility
mac->linkedTo = 0; mac->linkedTo = 0;
} else if (validArgumentCount != 6) { } else if (validArgumentCount != 6) {
@ -1033,12 +1034,12 @@ static void cliAux(char *cmdline)
analyzeModeActivationConditions(); analyzeModeActivationConditions();
cliPrintLinef( "aux %u %u %u %u %u %u %u", cliPrintLinef( "aux %u %u %u %u %u %u %u",
i, i,
mac->modeId, findBoxByBoxId(mac->modeId)->permanentId,
mac->auxChannelIndex, mac->auxChannelIndex,
MODE_STEP_TO_CHANNEL_VALUE(mac->range.startStep), MODE_STEP_TO_CHANNEL_VALUE(mac->range.startStep),
MODE_STEP_TO_CHANNEL_VALUE(mac->range.endStep), MODE_STEP_TO_CHANNEL_VALUE(mac->range.endStep),
mac->modeLogic, mac->modeLogic,
mac->linkedTo findBoxByBoxId(mac->linkedTo)->permanentId
); );
} else { } else {
cliShowArgumentRangeError("INDEX", 0, MAX_MODE_ACTIVATION_CONDITION_COUNT - 1); cliShowArgumentRangeError("INDEX", 0, MAX_MODE_ACTIVATION_CONDITION_COUNT - 1);