Skip to content
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.

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

Various PWM output changes. Mainly to get rid of potential conflicts #9452

Merged
merged 3 commits into from
Nov 7, 2023

Conversation

DzikuVx
Copy link
Member

@DzikuVx DzikuVx commented Nov 6, 2023

…with new timer allocation

@DzikuVx DzikuVx added this to the 7.0 milestone Nov 6, 2023
@@ -40,6 +36,11 @@ timerHardware_t timerHardware[] = {
DEF_TIM(TIM5, CH1, PA0, TIM_USE_OUTPUT_AUTO, 0, 0 ), // S7_OUT DMA1_ST2
DEF_TIM(TIM2, CH2, PB3, TIM_USE_OUTPUT_AUTO | TIM_USE_LED, 0, 0 ), // S8_OUT DMA1_ST6
DEF_TIM(TIM3, CH1, PB4, TIM_USE_OUTPUT_AUTO, 0, 0 ), // S9_OUT DMA1_ST4

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will change the order of the outputs, but the comments are already all over the place...

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But labels on the comments seem to be all over the place, as S10 is before S6.

S3_IN used to be S1 in INAV.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, updated

@mmosca
Copy link
Collaborator

mmosca commented Nov 6, 2023

I think overall it looks ok.

There is one fc where I think the outputs will change order/names, but the labels were already confusing in the target.h

@DzikuVx DzikuVx merged commit 168906c into release_7.0.0 Nov 7, 2023
14 checks passed
@DzikuVx DzikuVx deleted the dzikuvx-various-output-fixes branch November 7, 2023 10:46
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