Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 08:15:30 +03:00
Code Issues Wiki Activity

STM32F303 - Skip UART3 pins in PWM mapping when UART3 is used.

Browse source
This commit is contained in:
Dominic Clifton 2015-05-06 20:36:52 +01:00
parent 6f2b4f17f8
commit c0aec95e14
3 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/drivers/pwm_mapping.c
View file

@ -375,6 +375,12 @@ pwmOutputConfiguration_t *pwmInit(drv_pwm_config_t *init)
continue; continue;
#endif #endif
#ifdef STM32F303xC
// skip UART3 ports (PB10/PB11)
if (init->useUART3 && timerHardwarePtr->gpio == UART3_GPIO && (timerHardwarePtr->pin == UART3_TX_PIN || timerHardwarePtr->pin == UART3_RX_PIN))
continue;
#endif
#ifdef SOFTSERIAL_1_TIMER #ifdef SOFTSERIAL_1_TIMER
if (init->useSoftSerial && timerHardwarePtr->tim == SOFTSERIAL_1_TIMER) if (init->useSoftSerial && timerHardwarePtr->tim == SOFTSERIAL_1_TIMER)
continue; continue;

3
src/main/drivers/pwm_mapping.h
View file

@ -44,6 +44,9 @@ typedef struct drv_pwm_config_t {
bool useCurrentMeterADC; bool useCurrentMeterADC;
#ifdef STM32F10X #ifdef STM32F10X
bool useUART2; bool useUART2;
#endif
#ifdef STM32F303xC
bool useUART3;
#endif #endif
bool useVbat; bool useVbat;
bool useOneshot; bool useOneshot;

3
src/main/main.c
View file

@ -200,6 +200,9 @@ void init(void)
pwm_params.airplane = false; pwm_params.airplane = false;
#if defined(USE_USART2) && defined(STM32F10X) #if defined(USE_USART2) && defined(STM32F10X)
pwm_params.useUART2 = doesConfigurationUsePort(SERIAL_PORT_USART2); pwm_params.useUART2 = doesConfigurationUsePort(SERIAL_PORT_USART2);
#endif
#ifdef STM32F303xC
pwm_params.useUART3 = doesConfigurationUsePort(SERIAL_PORT_USART3);
#endif #endif
pwm_params.useVbat = feature(FEATURE_VBAT); pwm_params.useVbat = feature(FEATURE_VBAT);
pwm_params.useSoftSerial = feature(FEATURE_SOFTSERIAL); pwm_params.useSoftSerial = feature(FEATURE_SOFTSERIAL);