Skip to content

pwm_mapping: skip timer outputs on UART1's pins when UART1 has a function besides MSP #12131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MrScothh wants to merge 1 commit into
base: maintenance-10.x
Choose a base branch
from
+9 −0
Open

pwm_mapping: skip timer outputs on UART1's pins when UART1 has a function besides MSP #12131

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/main/drivers/pwm_mapping.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,15 @@ static bool checkPwmTimerConflicts(const timerHardware_t *timHw)
{
serialPortPins_t uartPins;

#if defined(USE_UART1)
// MSP is UART1's default next to the VCP and has always given these pins up to the outputs
const serialPortConfig_t *uart1Config = serialFindPortConfiguration(SERIAL_PORT_USART1);
uartGetPortPins(UARTDEV_1, &uartPins);
if (uart1Config && (uart1Config->functionMask & ~FUNCTION_MSP) && (timHw->tag == uartPins.txPin || timHw->tag == uartPins.rxPin)) {
return true;
}
#endif

#if defined(USE_UART2)
uartGetPortPins(UARTDEV_2, &uartPins);
if (doesConfigurationUsePort(SERIAL_PORT_USART2) && (timHw->tag == uartPins.txPin || timHw->tag == uartPins.rxPin)) {
Expand Down
Loading