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

Fix the problem of multiple timer allocations with bitbanged Dshot.

Browse source
This commit is contained in:
mikeller 2019-09-09 00:48:02 +12:00
parent f331cb3dd1
commit 4acf0893df
5 changed files with 30 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/main/drivers/timer_common.c
View file

@ -22,12 +22,15 @@
#ifdef USE_TIMER
#include "drivers/dshot_bitbang.h"
#include "drivers/io.h"
#include "timer.h"
#ifdef USE_TIMER_MGMT
#include "pg/timerio.h"
const resourceOwner_t freeOwner = { .owner = OWNER_FREE, .resourceIndex = 0 };
static resourceOwner_t timerOwners[MAX_TIMER_PINMAP_COUNT];
timerIOConfig_t *timerIoConfigByTag(ioTag_t ioTag)
@ -80,16 +83,23 @@ const timerHardware_t *timerGetByTag(ioTag_t ioTag)
const resourceOwner_t *timerGetOwner(int8_t timerNumber, uint16_t timerChannel)
{
static resourceOwner_t freeOwner = { .owner = OWNER_FREE, .resourceIndex = 0 };
const resourceOwner_t *timerOwner = &freeOwner;
for (unsigned i = 0; i < MAX_TIMER_PINMAP_COUNT; i++) {
const timerHardware_t *timer = timerGetByTagAndIndex(timerIOConfig(i)->ioTag, timerIOConfig(i)->index);
if (timer && timerGetTIMNumber(timer->tim) == timerNumber && timer->channel == timerChannel) {
return &timerOwners[i];
timerOwner = &timerOwners[i];
break;
}
}
return &freeOwner;
#if defined(USE_DSHOT_BITBANG)
if (!timerOwner->owner) {
timerOwner = dshotBitbangTimerGetOwner(timerNumber, timerChannel);
}
#endif
return timerOwner;
}
const timerHardware_t *timerAllocate(ioTag_t ioTag, resourceOwner_e owner, uint8_t resourceIndex)