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

STM32F30x - Working parallel PWM. Timer IRQ handle was not defined for

Browse source 
TIM8 correctly. Software serial conficted with parallel PWM input. Fixed
crash due to incorrect timerConfig index calculation code.

The crash occurred when capture compare interrupt handlers attempted to
call an invalid callback.

Note: the crash does not affect existing baseflight code since the
formula is OK when using a 2 dimensional array with equal dimensions.

Formula details here:
https://docs.google.com/spreadsheets/d/1UuxnC0VKiprvt1wt3KXffefEWJUb_-ILFLQuP377Anw
This commit is contained in:
Dominic Clifton 2014-05-02 17:09:41 +01:00
parent fbe2f82c05
commit 92bed4a33d
10 changed files with 82 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/drivers/pwm_common.c
View file

@ -59,9 +59,9 @@ typedef struct {
// for input only
uint8_t channel;
uint8_t state;
uint16_t rise;
uint16_t fall;
uint16_t capture;
captureCompare_t rise;
captureCompare_t fall;
captureCompare_t capture;
} pwmPortData_t;
enum {
@ -261,11 +261,12 @@ static pwmPortData_t *pwmInConfig(uint8_t port, timerCCCallbackPtr callback, uin
return p;
}
static void ppmCallback(uint8_t port, uint16_t capture)
static void ppmCallback(uint8_t port, captureCompare_t capture)
{
uint16_t diff;
static uint16_t now;
static uint16_t last = 0;
captureCompare_t diff;
static captureCompare_t now;
static captureCompare_t last = 0;
static uint8_t chan = 0;
static uint8_t GoodPulses;
@ -290,7 +291,7 @@ static void ppmCallback(uint8_t port, uint16_t capture)
}
}
static void pwmCallback(uint8_t port, uint16_t capture)
static void pwmCallback(uint8_t port, captureCompare_t capture)
{
if (pwmPorts[port].state == 0) {
pwmPorts[port].rise = capture;
@ -380,11 +381,16 @@ void pwmInit(drv_pwm_config_t *init, failsafe_t *initialFailsafe)
mask = TYPE_S;
#endif
#ifdef STM32F303xC
// remap PWM5+6 as servos
if (port == PWM5 || port == PWM6)
mask = TYPE_S;
#endif
// remap PWM 5+6 or 9+10 as servos - softserial pin pairs timer ports that use the same timer
if (init->useSoftSerial) {
if (port == PWM5 || port == PWM6)
mask = TYPE_S;
} else {
if (port == PWM9 || port == PWM10)
mask = TYPE_S;
}
#endif
}
if (init->extraServos && !init->airplane) {
// remap PWM5..8 as servos when used in extended servo mode