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

Allow COLOR_UI be used without TOUCH_SCREEN #20178

Merged

Conversation

rhapsodyv
Copy link
Member

Description

Fix #20172, allowing Color UI to be used without TOUCH_SCREEN.

Benefits

Fix #20172

@sjasonsmith
Copy link
Contributor

@rhapsodyv did you actually test these on hardware to make sure it behaves as expected?

@rhapsodyv
Copy link
Member Author

It only fixes compilation/warning issues, when touch is disabled. It works with encoder when touch is disabled.

@sjasonsmith
Copy link
Contributor

Can you add this combination to one of the test configurations, to prevent regression?

@rhapsodyv
Copy link
Member Author

Test added, and passed :-)

@thinkyhead thinkyhead merged commit 75924ed into MarlinFirmware:bugfix-2.0.x Nov 18, 2020
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
@rhapsodyv rhapsodyv deleted the allow-color-ui-without-touch branch December 31, 2020 20:39
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
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.

[BUG] MKS SGEN L V1.0 LPC1768 MKS TS35 V2.0 - LCD_BED_LEVELING and TFT_COLOR_UI compilation error
3 participants