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

Merge pull request #2276 from mikeller/clarify_resource_remapping_output 

Clarified resource remapping output and fixed output in case of double mapping.
This commit is contained in:
J Blackman 2017-01-31 19:25:05 +11:00 committed by GitHub
parent 46e1526103 4765ff4109
commit 48e7c62506
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/fc/cli.c
View File

@ -3501,9 +3501,18 @@ static void printResource(uint8_t dumpMask, const master_t *defaultConfig)
} }
} }
static void printResourceOwner(uint8_t owner, uint8_t index)
{
cliPrintf("%s", ownerNames[resourceTable[owner].owner]);
if (resourceTable[owner].maxIndex > 0) {
cliPrintf(" %d", RESOURCE_INDEX(index));
}
}
static void resourceCheck(uint8_t resourceIndex, uint8_t index, ioTag_t tag) static void resourceCheck(uint8_t resourceIndex, uint8_t index, ioTag_t tag)
{ {
const char * format = "\r\n* NOTE * %c%d moved from %s"; const char * format = "\r\nNOTE: %c%02d already assigned to ";
for (int r = 0; r < (int)ARRAYLEN(resourceTable); r++) { for (int r = 0; r < (int)ARRAYLEN(resourceTable); r++) {
for (int i = 0; i < MAX_RESOURCE_INDEX(resourceTable[r].maxIndex); i++) { for (int i = 0; i < MAX_RESOURCE_INDEX(resourceTable[r].maxIndex); i++) {
if (*(resourceTable[r].ptr + i) == tag) { if (*(resourceTable[r].ptr + i) == tag) {
@ -3516,14 +3525,17 @@ static void resourceCheck(uint8_t resourceIndex, uint8_t index, ioTag_t tag)
cleared = true; cleared = true;
} }
cliPrintf(format, DEFIO_TAG_GPIOID(tag) + 'A', DEFIO_TAG_PIN(tag), ownerNames[resourceTable[r].owner]); cliPrintf(format, DEFIO_TAG_GPIOID(tag) + 'A', DEFIO_TAG_PIN(tag));
if (resourceTable[r].maxIndex > 0) {
cliPrintf(" %d", RESOURCE_INDEX(i)); printResourceOwner(r, i);
}
if (cleared) { if (cleared) {
cliPrintf(". Cleared."); cliPrintf(". ");
printResourceOwner(r, i);
cliPrintf(" disabled");
} }
cliPrint("\r\n");
cliPrint(".\r\n");
} }
} }
} }