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

[2.0.x] Fix overridden Malyan LCD functions #10498

Merged
merged 2 commits into from
Apr 23, 2018

Conversation

xC0000005
Copy link
Contributor

Benefits

When my malyanlcd code was rebuilt, some #ifdef blocks were combined. The result is that the no lcd #else branch is active when MALYANLCD is defined. The null implementations are chosen by the linker and the result is the LCD doesn't work. Putting the function definitions back in their own #else fixes the problem. An "lcd" class might make some of this simpler, but since most of them use the ultralcd class, it would be overkill at the moment.

Related Issues

@thinkyhead
Copy link
Member

It looks like this needs a rebase, since it was submitted from an old branch. I will go ahead and attempt it.

@thinkyhead
Copy link
Member

Hmm, this has some redundancy, and I'm not sure what it changes. When MALYAN_LCD is enabled, ULTRA_LCD is not enabled. I'll add a new commit to illustrate the result without repeating the null function definitions to make it clearer. Meanwhile, what compile errors were you getting?

@xC0000005
Copy link
Contributor Author

xC0000005 commented Apr 23, 2018 via email

@thinkyhead
Copy link
Member

thinkyhead commented Apr 23, 2018

Yes, now I can see that from your change. I've added a commit that deals with that in a less redundant manner.

@thinkyhead
Copy link
Member

It looks like we could also implement the functions that set the status line for the Malyan LCD. Currently only calls to lcd_setalertstatusPGM will do so. Would it be useful for the status line to act the same way on this display as others?

@xC0000005
Copy link
Contributor Author

xC0000005 commented Apr 23, 2018 via email

thinkyhead added a commit that referenced this pull request Apr 23, 2018
Based on #10498

Co-Authored-By: xC0000005 <[email protected]>
@thinkyhead
Copy link
Member

Ah, good to know. In that case the other message-setters are ok to leave out. Thanks for the patch!

@thinkyhead thinkyhead changed the title Fix Malyan LCD Functions to not be accidentally overriden Fix overridden Malyan LCD functions Apr 23, 2018
@thinkyhead thinkyhead merged commit 8177c43 into MarlinFirmware:bugfix-2.0.x Apr 23, 2018
@thinkyhead thinkyhead changed the title Fix overridden Malyan LCD functions [2.0.x] Fix overridden Malyan LCD functions Apr 23, 2018
@xC0000005 xC0000005 deleted the MalyanLCDFix branch July 10, 2018 17:51
thinkyhead added a commit that referenced this pull request Sep 22, 2018
Based on #10498

Co-Authored-By: xC0000005 <[email protected]>
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.

2 participants