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

Fix Printrboard with LCD #2860

Conversation

sphereinabox
Copy link

The printrbot/printrboard fork of marlin has working LCD support and fixed some some fastio / teensy pin issues not in trunk. This PR includes those changes (commits listed below), but not as a proper merge commit.

I've spent enough time today fucking with finding the commits that fix the problems I was having. Please let me know how to go about making these "real" merge commits or how I can help you merge these (or more?) changes from the printrbot branch.


The commits fixing the LCD problems I had are listed below:

Commit: 1f17c43 [1f17c43]
Parents: 5d58fe0
Author: Laine Walker-Avina [email protected]
Date: Thursday, April 18, 2013 10:55:16 PM
Commit Date: Saturday, January 18, 2014 2:09:00 PM
Marlin_main: Disable JTAG in setup() if DISABLE_JTAG is defined

Allows use of JTAG pins as IO

Commit: a2b97c3 [a2b97c3]
Parents: cc992f0
Author: Laine Walker-Avina [email protected]
Date: Thursday, July 11, 2013 11:39:12 AM
Commit Date: Sunday, January 19, 2014 3:42:04 PM
Printrboard: Disable JTAG

Commit: ebe5f4b [ebe5f4b]
Parents: a2b97c3
Author: Laine Walker-Avina [email protected]
Date: Wednesday, July 24, 2013 10:20:47 PM
Commit Date: Sunday, January 19, 2014 3:42:04 PM
Fix fan pin from conflicting with other pins on Teensyduino based platforms

Commit: b02e8bd [b02e8bd]
Parents: ebe5f4b
Author: Laine Walker-Avina [email protected]
Date: Wednesday, July 24, 2013 10:25:42 PM
Commit Date: Sunday, January 19, 2014 3:42:04 PM
Fix pins for Printrboard

Commit: cc41b44 [cc41b44]
Parents: 875a39c
Author: Laine Walker-Avina [email protected]
Date: Friday, August 2, 2013 2:37:32 PM
Commit Date: Sunday, January 19, 2014 3:42:04 PM
ultralcd: Use SET_{OUTPUT|INPUT}() instead of pinMode() to set pin direction

…oder issues.

Commit: 1f17c43 [1f17c43]
Parents: 5d58fe0
Author: Laine Walker-Avina <[email protected]>
Date: Thursday, April 18, 2013 10:55:16 PM
Commit Date: Saturday, January 18, 2014 2:09:00 PM
Marlin_main: Disable JTAG in setup() if DISABLE_JTAG is defined

Allows use of JTAG pins as IO

Commit: a2b97c3 [a2b97c3]
Parents: cc992f0
Author: Laine Walker-Avina <[email protected]>
Date: Thursday, July 11, 2013 11:39:12 AM
Commit Date: Sunday, January 19, 2014 3:42:04 PM
Printrboard: Disable JTAG

Commit: ebe5f4b [ebe5f4b]
Parents: a2b97c3
Author: Laine Walker-Avina <[email protected]>
Date: Wednesday, July 24, 2013 10:20:47 PM
Commit Date: Sunday, January 19, 2014 3:42:04 PM
Fix fan pin from conflicting with other pins on Teensyduino based platforms

Commit: b02e8bd [b02e8bd]
Parents: ebe5f4b
Author: Laine Walker-Avina <[email protected]>
Date: Wednesday, July 24, 2013 10:25:42 PM
Commit Date: Sunday, January 19, 2014 3:42:04 PM
Fix pins for Printrboard

Commit: cc41b44 [cc41b44]
Parents: 875a39c
Author: Laine Walker-Avina <[email protected]>
Date: Friday, August 2, 2013 2:37:32 PM
Commit Date: Sunday, January 19, 2014 3:42:04 PM
ultralcd: Use SET_{OUTPUT|INPUT}() instead of pinMode() to set pin direction
// Disable JTAG on AT90USB chips to free up pins for IO
MCUCR = 0x80;
MCUCR = 0x80;
#endif
Copy link
Member

Choose a reason for hiding this comment

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

Compiler directives should be indented too in this codebase. And things inside of #if blocks also indented. In other words, every block indents, whether compiler or language.

@thinkyhead
Copy link
Member

Hey @sphereinabox — sorry for the long delay.

Overall this looks very good. It just needs a spacing tweak, and then it should be rebased against RCBugFix because we use that branch for stuff that will go into the next RC, while the HEAD of RC is meant to match the latest tagged release. If you need any assistance making a new PR please don't hesitate to ask.

The one thing I'm curious about is why the FAN pin needs to be set to output on every write. Is this just a Printrboard thing, or more of an "extra insurance" for all boards?

thinkyhead added a commit that referenced this pull request Mar 6, 2016
@thinkyhead thinkyhead merged commit 1bbea88 into MarlinFirmware:RC Mar 6, 2016
thinkyhead added a commit to thinkyhead/Marlin that referenced this pull request Mar 6, 2016
Based on MarlinFirmware#2860 - rebased for RCBugFix
@jbrazio jbrazio modified the milestone: 1.1.0 Jul 20, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants