Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-14 11:59:58 +03:00
Code Issues Wiki Activity

Fix origins for timer channel list

Browse source 
Selection is zero origin
Channel number is one origin for user I/O
This commit is contained in:
jflyper 2018-09-17 23:37:30 +09:00
parent c2747eed94
commit 0ff2d864b4
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/interface/cli.c
View file

@ -4109,7 +4109,7 @@ static void printTimer(uint8_t dumpMask)
cliDumpPrintLinef(dumpMask, false, format,
IO_GPIOPortIdxByTag(ioTag) + 'A',
IO_GPIOPinIdxByTag(ioTag),
timerIndex
timerIndex - 1
);
}
}
@ -4160,13 +4160,13 @@ static void cliTimer(char *cmdline)
if (pch) {
if (strcasecmp(pch, "list") == 0) {
/* output the list of available options */
uint8_t index = 1;
uint8_t index = 0;
for (unsigned i = 0; i < USABLE_TIMER_CHANNEL_COUNT; i++) {
if (timerHardware[i].tag == ioTag) {
cliPrintLinef("# %d. TIM%d CH%d",
index,
timerGetTIMNumber(timerHardware[i].tim),
CC_INDEX_FROM_CHANNEL(timerHardware[i].channel)
CC_INDEX_FROM_CHANNEL(timerHardware[i].channel) + 1
);
index++;
}
@ -4175,7 +4175,7 @@ static void cliTimer(char *cmdline)
} else if (strcasecmp(pch, "none") == 0) {
goto success;
} else {
timerIndex = atoi(pch);
timerIndex = atoi(pch) + 1;
}
} else {
goto error;