Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-13 19:40:31 +03:00
Code Issues Wiki Activity

Merge pull request #10863 from mikeller/add_n_channel_to_timer_show

Browse source
This commit is contained in:
Michael Keller 2021-08-04 01:43:30 +12:00 • committed by GitHub
commit 8a18651319
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 45 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1588,7 +1588,7 @@ static void cliSerialPassthrough(const char *cmdName, char *cmdline)
for (unsigned i = 0; i < getMotorCount(); i++) {
const ioTag_t tag = motorConfig()->dev.ioTags[i];
if (tag) {
const timerHardware_t *timerHardware = timerGetByTag(tag);
const timerHardware_t *timerHardware = timerGetConfiguredByTag(tag);
if (timerHardware) {
IO_t io = IOGetByTag(tag);
IOInit(io, OWNER_MOTOR, 0);
@ -5645,7 +5645,7 @@ static void cliDmaopt(const char *cmdName, char *cmdline)
#if defined(USE_TIMER_MGMT)
timerIoConfig = timerIoConfigByTag(ioTag);
#endif
timer = timerGetByTag(ioTag);
timer = timerGetConfiguredByTag(ioTag);
}
// opt or list
@ -5863,7 +5863,8 @@ static void showTimers(void)
cliPrintf("TIM%d:", timerNumber);
bool timerUsed = false;
for (unsigned timerIndex = 0; timerIndex < CC_CHANNELS_PER_TIMER; timerIndex++) {
const resourceOwner_t *timerOwner = timerGetOwner(timerNumber, CC_CHANNEL_FROM_INDEX(timerIndex));
const timerHardware_t *timer = timerGetAllocatedByNumberAndChannel(timerNumber, CC_CHANNEL_FROM_INDEX(timerIndex));
const resourceOwner_t *timerOwner = timerGetOwner(timer);
if (timerOwner->owner) {
if (!timerUsed) {
timerUsed = true;
@ -5872,9 +5873,9 @@ static void showTimers(void)
}
if (timerOwner->resourceIndex > 0) {
cliPrintLinef(" CH%d: %s %d", timerIndex + 1, ownerNames[timerOwner->owner], timerOwner->resourceIndex);
cliPrintLinef(" CH%d%s: %s %d", timerIndex + 1, timer->output & TIMER_OUTPUT_N_CHANNEL ? "N" : " ", ownerNames[timerOwner->owner], timerOwner->resourceIndex);
} else {
cliPrintLinef(" CH%d: %s", timerIndex + 1, ownerNames[timerOwner->owner]);
cliPrintLinef(" CH%d%s: %s", timerIndex + 1, timer->output & TIMER_OUTPUT_N_CHANNEL ? "N" : " ", ownerNames[timerOwner->owner]);
}
}
}