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

Follow-up the PR #4335 (Debug char, fix compile errors for lcd pins) #4340

Merged
merged 1 commit into from Jul 19, 2016
Merged

Conversation

ghost
Copy link

@ghost ghost commented Jul 18, 2016

Follow-up the PR #4335 (Debug char, fix compile errors for lcd pins)

It solves a flickering when SD card is inserted or removed at using a ASCII LCD + language_kana.h.
This fix is by @thinkyhead and [@Blue-Marlin](This need the same correction for MAPPER_NON as lcd_strlen%28%29) and @AnHardt, thus I much thankful to you again.

...Or, does alternative solution for fix available? Because

Probably not the best or real solution:

.
If it's true, please close this PR.

#endif
#else
if ((s[i] & 0xC0u) != 0x80u) j++;
#endif
Copy link
Contributor

@AnHardt AnHardt Jul 18, 2016

Choose a reason for hiding this comment

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

DE is a screen symbol at its own here.
We are pointing directly into the map of symbols.
No combining of the accent and the according character can be made.

-    if ((s[i] & 0xC0u) != 0x80u) j++;
 +    #if ENABLED(MAPPER_NON)
 +        j++;
 +    #else
 +      if ((s[i] & 0xC0u) != 0x80u) j++;
 +    #endif

should be more correct.

・Solve a flickering when SD card is inserted or removed at using a ASCII
LCD + language_kana.h
@ghost
Copy link
Author

ghost commented Jul 18, 2016

Thanks for the advice, I've updated.
And I've confirmed just now that it hasn't side effect in case of
ASCII LCD + language_kana.h,
ASCII LCD + language_en.h,
ASCII LCD + language_de.h,
GLCD + language_kana_utf8.h,
GLCD + language_en.h,
GLCD + language_de.h.

@jbrazio jbrazio added this to the 1.1.0 milestone Jul 18, 2016
@thinkyhead
Copy link
Member

Ah, I see the "non-printing 0xDE" character I was concerned about is shown as a printed character, so the code can be just as you have it here. Ok, then, good on us!

@thinkyhead thinkyhead merged commit d76389b into MarlinFirmware:RCBugFix Jul 19, 2016
@ghost ghost deleted the Follow-up-the-PR-#4335 branch July 20, 2016 10:27
@thinkyhead thinkyhead mentioned this pull request Jul 25, 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