Skip to content

Conversation

julianoes
Copy link
Contributor

Backport of #24669

julianoes added 3 commits May 5, 2025 10:54
The CCMR1_PPM define for PPM input on channel 2 was incorrectly set to 2,
which was setting bits for channel 1 instead of channel 2. This prevented
PPM input from functioning properly on channel 2.

Changed CCMR1_PPM for channel 2 from 2 to (1 << 8), which correctly
configures the CC2S bits for input capture mode on TI2.

This fixes an issue noted in the existing code comment:
"FIXME! There is an interaction in the CCMR registers that prevents
using Chan 1 as the timer and chan 2 as the PPM"

Tested on STM32H743 with PPM input on PC7 (TIM8_CH2).
By setting RC_SERIAL_PORT_SHARED_PPM_PIN_GPIO_RX it is now possible to
use the same pin on the STM32 for PPM input as well as serial input.
@julianoes julianoes requested a review from mrpollo May 4, 2025 22:55
Copy link

github-actions bot commented May 4, 2025

No flaws found

@mrpollo mrpollo merged commit 4e17c54 into main May 5, 2025
68 of 70 checks passed
@mrpollo mrpollo deleted the pr-1.16-kakuteh7-wing branch May 5, 2025 15:02
@mrpollo mrpollo restored the pr-1.16-kakuteh7-wing branch May 5, 2025 15:15
@julianoes julianoes deleted the pr-1.16-kakuteh7-wing branch May 5, 2025 22:53
@julianoes julianoes restored the pr-1.16-kakuteh7-wing branch May 6, 2025 00:07
@julianoes julianoes deleted the pr-1.16-kakuteh7-wing branch May 6, 2025 00:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants