Fix for issue #300 #305

Merged
merged 2 commits into from Dec 29, 2012

Projects

None yet

2 participants

@EmbeddedMan
Member

Here's the second pull request for the other changes. I know it includes both commits, but I can't figure out how to create a branch that backs out the one change and only has the newer change.

@EmbeddedMan EmbeddedMan Fix for issue #300 - adds code to detect 'high' baud rates (>=200000 …
…baud) and uses BRGH = 1 (the high baud rate divisor) to get them right.

Tested with all standard baud rates from 9600 to 921600 using terminal emulator. Tested at 2,000,000 (2Mbps) using scope. All correct.
2573386
@ricklon
Member
ricklon commented Dec 1, 2012

I merged the 298 chance. It's now giving and issue for this pull. I'll have to see what the conflict is.

@ricklon
Member
ricklon commented Dec 28, 2012

Brian,

Any chance you can do a pull request for this again? A previous pull request merge conflicted with it.

--Rick

@EmbeddedMan
Member

Sure, but it may take me a bit to get it all set up again - I'm on travel until the 3rd.

@EmbeddedMan EmbeddedMan Merge branch 'master' of https://github.com/chipKIT32/chipKIT32-MAX
Conflicts:
	hardware/pic32/cores/pic32/HardwareSerial.cpp
Included in this change is the fix for issue #300 - adding ability to use high baud rates for hardware serial ports.
3d03435
@EmbeddedMan
Member

Rick, I've updated the code on my chipKIT repo, but it won't let me issue another pull request because there already is one outstanding. However, if you do a pull now, it should merge cleanly. Let me know if it doesn't.

@ricklon ricklon merged commit 7a65551 into chipKIT32:master Dec 29, 2012
@ricklon
Member
ricklon commented Dec 29, 2012

It worked!

Thanks
-_Rick

On Sat, Dec 29, 2012 at 9:30 AM, Brian Schmalz notifications@github.comwrote:

Rick, I've updated the code on my chipKIT repo, but it won't let me issue
another pull request because there already is one outstanding. However, if
you do a pull now, it should merge cleanly. Let me know if it doesn't.


Reply to this email directly or view it on GitHubhttps://github.com/chipKIT32/chipKIT32-MAX/pull/305#issuecomment-11753189.

Co-founder
Fair Use Building and Research (FUBAR) Labs
http://fubarlabs.org

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment