Skip to content

cpu/stm32f4discovery: fixed freq return in pwm_init#4454

Merged
A-Paul merged 1 commit intoRIOT-OS:masterfrom
haukepetersen:fix_stm32f4_pwmfreq
Dec 10, 2015
Merged

cpu/stm32f4discovery: fixed freq return in pwm_init#4454
A-Paul merged 1 commit intoRIOT-OS:masterfrom
haukepetersen:fix_stm32f4_pwmfreq

Conversation

@haukepetersen
Copy link
Copy Markdown
Contributor

@haukepetersen haukepetersen commented Dec 9, 2015

fixes #4439

@haukepetersen haukepetersen added the Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) label Dec 9, 2015
@haukepetersen haukepetersen added this to the Release 2016.03 milestone Dec 9, 2015
@haukepetersen haukepetersen added Platform: ARM Platform: This PR/issue effects ARM-based platforms Impact: minor The PR is small in size and might only require a quick look of a knowledgeable reviewer labels Dec 9, 2015
@haukepetersen haukepetersen mentioned this pull request Dec 9, 2015
Closed
A-Paul
A-Paul reviewed Dec 9, 2015
View reviewed changes
cpu/stm32f4/periph/pwm.c Outdated
Copy link
Copy Markdown
Member

@A-Paul A-Paul Dec 9, 2015

Choose a reason for hiding this comment

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

(tim->PSC + 1) to compensate for the "one" you subtracted in line 121. ;-)

Copy link
Copy Markdown
Contributor Author

@haukepetersen haukepetersen Dec 10, 2015

Choose a reason for hiding this comment

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

makes sense

@haukepetersen haukepetersen added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Dec 10, 2015
@haukepetersen
Copy link
Copy Markdown
Contributor Author

haukepetersen commented Dec 10, 2015

fixed and squashed

A-Paul
A-Paul reviewed Dec 10, 2015
View reviewed changes
cpu/stm32f4/periph/pwm.c Outdated
Copy link
Copy Markdown
Member

@A-Paul A-Paul Dec 10, 2015

Choose a reason for hiding this comment

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

Closing parethesis missing.

Copy link
Copy Markdown
Contributor Author

@haukepetersen haukepetersen Dec 10, 2015

Choose a reason for hiding this comment

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

ups, forgot to press the save button before commiting... fixed

@A-Paul
Copy link
Copy Markdown
Member

A-Paul commented Dec 10, 2015

Accidently commented in commit. Deleted.

@A-Paul
Copy link
Copy Markdown
Member

A-Paul commented Dec 10, 2015

Thanks for corrections. ACK when Travis is happy.

@A-Paul A-Paul modified the milestones: Release 2015.12, Release 2016.03 Dec 10, 2015
@A-Paul
Copy link
Copy Markdown
Member

A-Paul commented Dec 10, 2015

Go!

A-Paul pushed a commit that referenced this pull request Dec 10, 2015
Merge pull request #4454 from haukepetersen/fix_stm32f4_pwmfreq
26eeb9f 
cpu/stm32f4discovery: fixed freq return in pwm_init
@A-Paul A-Paul merged commit 26eeb9f into RIOT-OS:master Dec 10, 2015
@OlegHahm OlegHahm added the Process: needs backport Integration Process: The PR is required to be backported to a release or feature branch label Dec 10, 2015
@OlegHahm
Copy link
Copy Markdown
Member

OlegHahm commented Dec 10, 2015

Should this also go into 2015.12-branch?

@A-Paul
Copy link
Copy Markdown
Member

A-Paul commented Dec 11, 2015

I thought 2015.12 isn't freezed yet. Will it cause any inconvenience?

@haukepetersen haukepetersen deleted the fix_stm32f4_pwmfreq branch December 11, 2015 09:39
@haukepetersen
Copy link
Copy Markdown
Contributor Author

haukepetersen commented Dec 11, 2015

I think it's rather minor and not really worth the effort, having it for 2016.03 should be fine... (expect @A-Paul disagrees with me...)

@A-Paul
Copy link
Copy Markdown
Member

A-Paul commented Dec 11, 2015

I think it's rather minor and not really worth the effort...

I dont want to push anything. I simply try to understand "what is the effort?". I also can't find info about the 'backporting-needed' label.

@OlegHahm
Copy link
Copy Markdown
Member

OlegHahm commented Dec 11, 2015

The label backporting-needed means that backporting to the bugfixing release branch is needed. Will add it to the corresponding Wiki page.

Current state is:

  • we are in feature freeze for the release (2015.12)
  • the release will be tagged on the branch 2015.12-branch
  • hence, new features may be merged into master
  • 2015.12-branch will only receive bugfixes until feature freeze for 2016.03

I have no strong opinion regarding this PR, but just cherry-picking this onto 2015.12-branch and opening a PR with the Ready for CI build label set right from the start is definitely less effort than any further discussion. ;)

@OlegHahm
Copy link
Copy Markdown
Member

OlegHahm commented Dec 11, 2015

P.S. Thanks, @A-Paul, for pointing out that this label is undocumented.

@A-Paul
Copy link
Copy Markdown
Member

A-Paul commented Dec 11, 2015

@haukepetersen seems like I stumbled into unknown cliffs of the release process.
I have no timing preference. So please, before I mess up things any further, chose what is the most convenient advance.

@jnohlgard jnohlgard mentioned this pull request Jan 14, 2016
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@A-Paul A-Paul

Labels

CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Impact: minor The PR is small in size and might only require a quick look of a knowledgeable reviewer Platform: ARM Platform: This PR/issue effects ARM-based platforms Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)

Projects

None yet

Milestone

Release 2015.12

Development

Successfully merging this pull request may close these issues.

stm32f4: pwm_init returns wrong value

4 participants

@haukepetersen @A-Paul @OlegHahm @cgundogan