Skip to content

cpu/stm32/pwm: made channel config more flexible#6393

Merged
aabadie merged 2 commits intoRIOT-OS:masterfrom
haukepetersen:opt_stm32_pwmchanconf
Jan 18, 2017
Merged

cpu/stm32/pwm: made channel config more flexible#6393
aabadie merged 2 commits intoRIOT-OS:masterfrom
haukepetersen:opt_stm32_pwmchanconf

Conversation

@haukepetersen
Copy link
Copy Markdown
Contributor

@haukepetersen haukepetersen commented Jan 17, 2017

alternative to #6350

Now the logical PWM channels used be RIOT are decoupled from the actual used HW CC channels.

@haukepetersen haukepetersen added Platform: ARM Platform: This PR/issue effects ARM-based platforms Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation labels Jan 17, 2017
@haukepetersen haukepetersen added this to the Release 2017.01 milestone Jan 17, 2017
@haukepetersen haukepetersen mentioned this pull request Jan 17, 2017
Closed
aabadie
aabadie reviewed Jan 17, 2017
View reviewed changes
Copy link
Copy Markdown
Contributor

@aabadie aabadie left a comment

Choose a reason for hiding this comment

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

Definitely a cleanest solution than #6350 : +1

boards/stm32f4discovery/include/periph_conf.h
.chan = 4,
.bus = APB1
}
// {
Copy link
Copy Markdown
Contributor

@aabadie aabadie Jan 17, 2017

Choose a reason for hiding this comment

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

Why commenting this out ?

Copy link
Copy Markdown
Contributor Author

@haukepetersen haukepetersen Jan 18, 2017

Choose a reason for hiding this comment

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

This was a debugging leftover, should have been fixed before merging... Will open a separate PR.

Copy link
Copy Markdown
Contributor

@aabadie aabadie Jan 18, 2017

Choose a reason for hiding this comment

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

Fixed by #6404

@aabadie
Copy link
Copy Markdown
Contributor

aabadie commented Jan 17, 2017

Jenkins is failing because of an unrelated reason

/tests-tweetnacl.c:25:23: fatal error: tweetnacl.h: No such file or directory

@kYc0o
Copy link
Copy Markdown
Contributor

kYc0o commented Jan 17, 2017

Let's see what Murdock says...

@kYc0o kYc0o added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Jan 17, 2017
@PeterKietzmann
Copy link
Copy Markdown
Member

PeterKietzmann commented Jan 18, 2017

Murdock says yes. @aabadie mind to approve?

aabadie
aabadie approved these changes Jan 18, 2017
View reviewed changes
Copy link
Copy Markdown
Contributor

@aabadie aabadie left a comment

Choose a reason for hiding this comment

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

All green, merging !

@aabadie aabadie merged commit 20089be into RIOT-OS:master Jan 18, 2017
@haukepetersen haukepetersen mentioned this pull request Jan 18, 2017
Merged
@haukepetersen haukepetersen deleted the opt_stm32_pwmchanconf branch January 18, 2017 08:41
@haukepetersen haukepetersen mentioned this pull request Jan 18, 2017
Merged
This was referenced Jan 18, 2017
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@aabadie aabadie aabadie approved these changes

Assignees

@aabadie aabadie

Labels

CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Platform: ARM Platform: This PR/issue effects ARM-based platforms Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@haukepetersen @aabadie @kYc0o @PeterKietzmann