-
-
Notifications
You must be signed in to change notification settings - Fork 19.2k
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
Allow COLOR_UI be used without TOUCH_SCREEN #20178
Merged
thinkyhead
merged 2 commits into
MarlinFirmware:bugfix-2.0.x
from
rhapsodyv:allow-color-ui-without-touch
Nov 18, 2020
Merged
Allow COLOR_UI be used without TOUCH_SCREEN #20178
thinkyhead
merged 2 commits into
MarlinFirmware:bugfix-2.0.x
from
rhapsodyv:allow-color-ui-without-touch
Nov 18, 2020
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rhapsodyv
force-pushed
the
allow-color-ui-without-touch
branch
from
November 17, 2020 17:23
6060941
to
5df8e1b
Compare
rhapsodyv
force-pushed
the
allow-color-ui-without-touch
branch
from
November 17, 2020 17:33
5df8e1b
to
f541c36
Compare
@rhapsodyv did you actually test these on hardware to make sure it behaves as expected? |
It only fixes compilation/warning issues, when touch is disabled. It works with encoder when touch is disabled. |
Can you add this combination to one of the test configurations, to prevent regression? |
Test added, and passed :-) |
FhlostonParadise
pushed a commit
to FhlostonParadise/Marlin
that referenced
this pull request
Nov 21, 2020
Kannix2005
pushed a commit
to Kannix2005/Marlin-1
that referenced
this pull request
Dec 7, 2020
vgadreau
pushed a commit
to vgadreau/Marlin
that referenced
this pull request
Dec 9, 2020
tharts
pushed a commit
to tharts/Marlin
that referenced
this pull request
Jan 6, 2021
dpreed
pushed a commit
to dpreed/Marlin_2.0.x
that referenced
this pull request
Feb 5, 2021
kpishere
pushed a commit
to kpishere/Marlin
that referenced
this pull request
Feb 19, 2021
W4tel-BiDi
pushed a commit
to W4tel-BiDi/Marlin
that referenced
this pull request
Apr 5, 2021
thinkyhead
pushed a commit
to thinkyhead/Marlin
that referenced
this pull request
Apr 28, 2021
thinkyhead
pushed a commit
to thinkyhead/Marlin
that referenced
this pull request
Apr 29, 2021
thinkyhead
pushed a commit
that referenced
this pull request
Apr 30, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Fix #20172, allowing Color UI to be used without TOUCH_SCREEN.
Benefits
Fix #20172