From 950ed79749ae6633a2e8d3e5d781763db2ba4ca5 Mon Sep 17 00:00:00 2001 From: Michael Keller Date: Tue, 31 Jan 2017 14:00:25 +1300 Subject: [PATCH] Clarified resource remapping output and fixed output in case of double mapping. --- src/main/fc/cli.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/main/fc/cli.c b/src/main/fc/cli.c index bb242e96ce..700711f1ab 100755 --- a/src/main/fc/cli.c +++ b/src/main/fc/cli.c @@ -3373,9 +3373,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) { - 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 i = 0; i < MAX_RESOURCE_INDEX(resourceTable[r].maxIndex); i++) { if (*(resourceTable[r].ptr + i) == tag) { @@ -3388,14 +3397,17 @@ static void resourceCheck(uint8_t resourceIndex, uint8_t index, ioTag_t tag) cleared = true; } - cliPrintf(format, DEFIO_TAG_GPIOID(tag) + 'A', DEFIO_TAG_PIN(tag), ownerNames[resourceTable[r].owner]); - if (resourceTable[r].maxIndex > 0) { - cliPrintf(" %d", RESOURCE_INDEX(i)); - } + cliPrintf(format, DEFIO_TAG_GPIOID(tag) + 'A', DEFIO_TAG_PIN(tag)); + + printResourceOwner(r, i); + if (cleared) { - cliPrintf(". Cleared."); + cliPrintf(". "); + printResourceOwner(r, i); + cliPrintf(" disabled"); } - cliPrint("\r\n"); + + cliPrint(".\r\n"); } } }