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.

Sign up for GitHub

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

Jump to bottom

Buttons colors, Conditionals_LCD.h #25300

Merged
merged 4 commits into from
Feb 1, 2023
Merged

Buttons colors, Conditionals_LCD.h #25300

merged 4 commits into from
Feb 1, 2023

Conversation

alexgrach
Copy link
Contributor

Description

Moved buttons colors defenitions to tft_colors.h. All LCD resolutions use equal colors and can be redefined by user at configuration files.

Fix: Swapped rows count for TFT_COLOR_UI_PORTRAIT (portrait orintation has more rows then landscape).

Requirements

Any LCD for TFT_COLOR_UI

Fix: Any 320x240 LCD, TFT_COLOR_UI portrait orientation.

Benefits

Configurations

Related Issues

#25281

@alexgrach alexgrach marked this pull request as ready for review January 27, 2023 18:53
@tpruvot
Copy link
Contributor

tpruvot commented Jan 28, 2023

this PR includes the fix for COLOR_UI, menus are unusable in 320x240 landscape since PR #25281 (cant be scrolled)

@thinkyhead thinkyhead merged commit fbe9237 into MarlinFirmware:bugfix-2.1.x Feb 1, 2023
uBaHoFF added a commit to uBaHoFF/Marlin that referenced this pull request Feb 4, 2023
@uBaHoFF
Squashed commit of the following:
753ae87 
commit 6b17d4a
Merge: 73fa199 218ca05
Author: uBaHoFF <[email protected]>
Date:   Sat Feb 4 12:40:50 2023 +0200

    Merge branch 'bugfix-2.1.x' into HEVO-BTT-SKR-1.3

commit 218ca05
Author: Victor Oliveira <[email protected]>
Date:   Sat Feb 4 05:10:26 2023 -0300

    🧑‍💻 General 'MediaFile' type alias (MarlinFirmware#24424)

commit 08d9cbb
Author: vyacheslav-shubin <[email protected]>
Date:   Sat Feb 4 10:36:07 2023 +0300

    🧑‍💻 Add SD Card 'hide' method for dev usage (MarlinFirmware#22425)

commit 7c0b465
Author: thinkyhead <[email protected]>
Date:   Fri Feb 3 06:06:11 2023 +0000

    [cron] Bump distribution date (2023-02-03)

commit cea176a
Author: Martin Turski <[email protected]>
Date:   Fri Feb 3 04:01:22 2023 +0100

    🔨 Fix test build path with spaces (MarlinFirmware#25329)

commit cb7af50
Author: Keith Bennett <[email protected]>
Date:   Thu Feb 2 17:41:46 2023 -0800

    📝 Fix Z*_ENDSTOP_ADJUSTMENT comments (MarlinFirmware#25295)

commit a80036e
Author: thinkyhead <[email protected]>
Date:   Thu Feb 2 00:23:18 2023 +0000

    [cron] Bump distribution date (2023-02-02)

commit 8f11428
Author: kg333 <[email protected]>
Date:   Wed Feb 1 19:02:26 2023 -0500

    📺 Melzi v4 with BTT SKR Mini E3 (MarlinFirmware#25321)

commit 3be967b
Author: Scott Lahteine <[email protected]>
Date:   Wed Feb 1 02:19:47 2023 -0600

    🩹 PID / MPC heating followup

    Followup to MarlinFirmware#25314

commit 57a7e28
Author: Bob Kuhn <[email protected]>
Date:   Wed Feb 1 02:43:06 2023 -0600

    🩹 Fix progress DOGM compile error (MarlinFirmware#25319)

commit 64338df
Author: Bob Kuhn <[email protected]>
Date:   Wed Feb 1 01:51:11 2023 -0600

    🔧 Fix SD sorting sanity checks (MarlinFirmware#25318)

commit fbe9237
Author: alexgrach <[email protected]>
Date:   Wed Feb 1 10:40:13 2023 +0300

    🐛 Fix TFT touch buttons, button colors (MarlinFirmware#25300)

commit d6f4f24
Author: tombrazier <[email protected]>
Date:   Wed Feb 1 07:25:13 2023 +0000

    🩹 Fix PID / MPC heating flags (MarlinFirmware#25314)

    Co-authored-by: Scott Lahteine <[email protected]>

commit aae103e
Author: thinkyhead <[email protected]>
Date:   Wed Feb 1 00:25:54 2023 +0000

    [cron] Bump distribution date (2023-02-01)

commit 738f0a1
Author: Dan Royer <[email protected]>
Date:   Mon Jan 30 22:12:03 2023 -0800

    ✨ POLARGRAPH / PEN_UP_DOWN_MENU (MarlinFirmware#25303)

    Co-authored-by: Dan Royer <[email protected]>

commit 5446968
Author: thinkyhead <[email protected]>
Date:   Tue Jan 31 06:05:55 2023 +0000

    [cron] Bump distribution date (2023-01-31)

commit 2dda0c0
Author: Giuliano Zaro <[email protected]>
Date:   Tue Jan 31 06:07:51 2023 +0100

    🌐 Update Italian language (MarlinFirmware#25309)

commit 7ad3586
Author: Roman Moravčík <[email protected]>
Date:   Tue Jan 31 06:07:03 2023 +0100

    🌐 Update Slovak language (MarlinFirmware#25305)

commit 087e19a
Author: Scott Lahteine <[email protected]>
Date:   Mon Jan 30 22:11:50 2023 -0600

    🔧 Fix build with no Y axis (MarlinFirmware#25311)

commit d0a965a
Author: Darren Garnier <[email protected]>
Date:   Mon Jan 30 23:00:49 2023 -0500

    🔨 Fix config.ini URL fetch (MarlinFirmware#25313)

commit 0c181fc
Author: Bob Kuhn <[email protected]>
Date:   Mon Jan 30 21:57:36 2023 -0600

    🩹 Fix G61 axis parameters with no offset (MarlinFirmware#25312)

commit 67bc855
Author: thinkyhead <[email protected]>
Date:   Fri Jan 27 00:27:06 2023 +0000

    [cron] Bump distribution date (2023-01-27)

commit ab767a4
Author: alexgrach <[email protected]>
Date:   Fri Jan 27 03:20:09 2023 +0300

    🐛 Fix TFT Color UI LCD_HEIGHT (MarlinFirmware#25281)

commit 0e748da
Author: xBiohazardx <[email protected]>
Date:   Fri Jan 27 01:05:04 2023 +0100

    ✏️ Fix probe invert flag (MarlinFirmware#25282)

commit 2637153
Author: thinkyhead <[email protected]>
Date:   Thu Jan 26 06:05:55 2023 +0000

    [cron] Bump distribution date (2023-01-26)

commit a2c93c2
Author: avionix-g <[email protected]>
Date:   Wed Jan 25 23:14:52 2023 -0500

    🐛 Fix MKS board Ultipanel support (MarlinFirmware#25278)

commit 4f902ac
Author: Alexander Gavrilenko <[email protected]>
Date:   Thu Jan 26 07:05:43 2023 +0300

    🐛 Fix Simulator TFT compile (MarlinFirmware#25279)

commit cf02107
Author: Scott Lahteine <[email protected]>
Date:   Wed Jan 25 21:37:10 2023 -0600

    🔧 Refine Input Shaping check (MarlinFirmware#25280)

commit 7a49fab
Author: thinkyhead <[email protected]>
Date:   Tue Jan 24 12:07:25 2023 +0000

    [cron] Bump distribution date (2023-01-24)

commit 7393285
Author: Scott Lahteine <[email protected]>
Date:   Fri Jan 20 21:17:13 2023 -0600

    SDIO retry, hsd clock, etc.

commit e0ae072
Author: Scott Lahteine <[email protected]>
Date:   Tue Jan 24 02:21:02 2023 -0600

    🔧 Overridable Stepper EN init

commit 4099763
Author: thinkyhead <[email protected]>
Date:   Mon Jan 23 12:07:26 2023 +0000

    [cron] Bump distribution date (2023-01-23)

commit 3268897
Author: Bob Kuhn <[email protected]>
Date:   Mon Jan 23 01:37:35 2023 -0600

    🐛 Fix Ender-2 Stock Display with Melzi (MarlinFirmware#25258)

commit fffc966
Author: Scott Lahteine <[email protected]>
Date:   Mon Jan 23 01:22:03 2023 -0600

    🐛 Fix homing_needed_error bits

commit e656f10
Author: thinkyhead <[email protected]>
Date:   Sun Jan 22 06:05:45 2023 +0000

    [cron] Bump distribution date (2023-01-22)

commit 7e72981
Author: Scott Lahteine <[email protected]>
Date:   Sat Jan 21 22:57:56 2023 -0600

    🚸 Fix homing_needed_error language

commit b7c2363
Author: ellensp <[email protected]>
Date:   Sun Jan 22 15:08:37 2023 +1300

    🐛 Fix misc. UI issues (MarlinFirmware#25252)

    Co-authored-by: Scott Lahteine <[email protected]>

commit f2b8942
Author: thinkyhead <[email protected]>
Date:   Wed Jan 18 00:22:56 2023 +0000

    [cron] Bump distribution date (2023-01-18)

commit f81c468
Author: John Robertson <[email protected]>
Date:   Tue Jan 17 23:53:39 2023 +0000

    🐛 Fix potential I2S buffer overwrite (MarlinFirmware#25113)

commit b3f65b6
Author: Miguel Risco-Castillo <[email protected]>
Date:   Tue Jan 17 18:41:36 2023 -0500

    🚸 ProUI MPC menu (MarlinFirmware#25232)

    Co-authored-by: Scott Lahteine <[email protected]>

commit 99d1b04
Author: alexgrach <[email protected]>
Date:   Wed Jan 18 02:37:19 2023 +0300

    ✨ TFT 320x240 portrait (MarlinFirmware#25207)

    Co-authored-by: Scott Lahteine <[email protected]>

commit 58f64ea
Author: thinkyhead <[email protected]>
Date:   Tue Jan 17 06:05:52 2023 +0000

    [cron] Bump distribution date (2023-01-17)

commit c448208
Author: Scott Lahteine <[email protected]>
Date:   Mon Jan 16 22:11:49 2023 -0600

    🎨 Heading cleanup

commit 938d7b5
Author: thinkyhead <[email protected]>
Date:   Mon Jan 16 00:22:07 2023 +0000

    [cron] Bump distribution date (2023-01-16)

commit 6fe387b
Author: Scott Lahteine <[email protected]>
Date:   Sun Jan 15 06:48:17 2023 -0600

    🧑‍💻 Adjust PID / MPC / ProUI

    Changes to simplify MarlinFirmware#25232 WIP

commit d94defc
Author: Scott Lahteine <[email protected]>
Date:   Sun Jan 15 06:48:17 2023 -0600

    🎨 Language / menu cleanup

commit 212167b
Author: Keith Bennett <[email protected]>
Date:   Sun Jan 15 05:25:36 2023 -0800

    📝 No longer experimental (MarlinFirmware#25238)

commit d753781
Author: thinkyhead <[email protected]>
Date:   Sun Jan 15 12:06:24 2023 +0000

    [cron] Bump distribution date (2023-01-15)

commit da87c20
Author: Scott Lahteine <[email protected]>
Date:   Sun Jan 15 01:19:45 2023 -0600

    🔖  Config version 02010300

commit 5acf738
Author: Scott Lahteine <[email protected]>
Date:   Sun Jan 15 01:11:49 2023 -0600

    🔧 Added MOTHERBOARD error text

commit 80a2555
Author: thinkyhead <[email protected]>
Date:   Sat Jan 14 18:05:38 2023 +0000

    [cron] Bump distribution date (2023-01-14)

commit 5fd5cb0
Author: Scott Lahteine <[email protected]>
Date:   Sat Jan 14 07:44:57 2023 -0600

    ✏️  ProUI followup

commit 7503ac3
Author: thinkyhead <[email protected]>
Date:   Fri Jan 13 00:22:51 2023 +0000

    [cron] Bump distribution date (2023-01-13)

commit 80dc7b2
Author: Scott Lahteine <[email protected]>
Date:   Wed Jan 11 20:31:46 2023 -0600

    🔧 Input Shaping sanity checks

commit 3d0b11a
Author: thinkyhead <[email protected]>
Date:   Thu Jan 12 01:39:45 2023 +0000

    [cron] Bump distribution date (2023-01-12)

commit 73fa199
Merge: 6444761 0838f70
Author: uBaHoFF <[email protected]>
Date:   Thu Jan 12 01:20:10 2023 +0200

    Merge branch 'bugfix-2.1.x' into HEVO-BTT-SKR-1.3

commit 0838f70
Author: Scott Lahteine <[email protected]>
Date:   Wed Jan 11 01:19:54 2023 -0600

    🩹 Fix Sim with USE_WATCHDOG disabled

commit 5af5c2a
Author: Scott Lahteine <[email protected]>
Date:   Wed Jan 11 01:19:45 2023 -0600

    🔨 Improve config.ini parser

commit fe62c80
Author: thinkyhead <[email protected]>
Date:   Wed Jan 11 06:24:37 2023 +0000

    [cron] Bump distribution date (2023-01-11)

commit 64167df
Author: Powerlated <[email protected]>
Date:   Wed Jan 11 00:40:15 2023 -0500

    ✨ PREHEAT_TIME_BED_MS (MarlinFirmware#25146)

commit 250fd60
Author: Alex Z <[email protected]>
Date:   Wed Jan 11 15:22:28 2023 +1000

    🐛 Fix Chitu V6 Z_STOP_PIN (MarlinFirmware#25227)

commit 01e58de
Author: Scott Lahteine <[email protected]>
Date:   Tue Jan 10 22:38:08 2023 -0600

    🩹 ProUI - Remove ManualZOffset

commit 7717beb
Author: kadir ilkimen <[email protected]>
Date:   Wed Jan 11 06:29:38 2023 +0200

    ✨ Polar Kinematics (MarlinFirmware#25214)

commit 33e5aad
Author: thinkyhead <[email protected]>
Date:   Tue Jan 10 01:41:43 2023 +0000

    [cron] Bump distribution date (2023-01-10)
k-piekarczyk added a commit to k-piekarczyk/Marlin that referenced this pull request Feb 6, 2023
@k-piekarczyk @Bob-the-Kuhn
@dgarnier @thinkyhead @rmoravcik @GMagician @i-make-robots @tombrazier @alexgrach @kg333 @thisiskeithb @quiret @vyacheslav-shubin @rhapsodyv
Pull in new changes (#1)
758f631 
* 🩹 Fix G61 axis parameters with no offset (MarlinFirmware#25312)

* 🔨 Fix config.ini URL fetch (MarlinFirmware#25313)

* 🔧 Fix build with no Y axis (MarlinFirmware#25311)

* 🌐 Update Slovak language (MarlinFirmware#25305)

* 🌐 Update Italian language (MarlinFirmware#25309)

* [cron] Bump distribution date (2023-01-31)

* ✨ POLARGRAPH / PEN_UP_DOWN_MENU (MarlinFirmware#25303)

Co-authored-by: Dan Royer <[email protected]>

* [cron] Bump distribution date (2023-02-01)

* 🩹 Fix PID / MPC heating flags (MarlinFirmware#25314)

Co-authored-by: Scott Lahteine <[email protected]>

* 🐛 Fix TFT touch buttons, button colors (MarlinFirmware#25300)

* 🔧 Fix SD sorting sanity checks (MarlinFirmware#25318)

* 🩹 Fix progress DOGM compile error (MarlinFirmware#25319)

* 🩹 PID / MPC heating followup

Followup to MarlinFirmware#25314

* 📺 Melzi v4 with BTT SKR Mini E3 (MarlinFirmware#25321)

* [cron] Bump distribution date (2023-02-02)

* 📝 Fix Z*_ENDSTOP_ADJUSTMENT comments (MarlinFirmware#25295)

* 🔨 Fix test build path with spaces (MarlinFirmware#25329)

* [cron] Bump distribution date (2023-02-03)

* 🧑‍💻 Add SD Card 'hide' method for dev usage (MarlinFirmware#22425)

* 🧑‍💻 General 'MediaFile' type alias (MarlinFirmware#24424)

* [cron] Bump distribution date (2023-02-04)

---------

Co-authored-by: Bob Kuhn <[email protected]>
Co-authored-by: Darren Garnier <[email protected]>
Co-authored-by: Scott Lahteine <[email protected]>
Co-authored-by: Roman Moravčík <[email protected]>
Co-authored-by: Giuliano Zaro <[email protected]>
Co-authored-by: Dan Royer <[email protected]>
Co-authored-by: Dan Royer <[email protected]>
Co-authored-by: tombrazier <[email protected]>
Co-authored-by: alexgrach <[email protected]>
Co-authored-by: kg333 <[email protected]>
Co-authored-by: Keith Bennett <[email protected]>
Co-authored-by: Martin Turski <[email protected]>
Co-authored-by: vyacheslav-shubin <[email protected]>
Co-authored-by: Victor Oliveira <[email protected]>
thinkyhead pushed a commit to thinkyhead/Marlin that referenced this pull request Feb 22, 2023
@alexgrach @thinkyhead
🐛 Fix TFT touch buttons, button colors (MarlinFirmware#25300)
5e1ac85
LMBernardo pushed a commit to LMBernardo/Marlin that referenced this pull request Mar 19, 2023
@alexgrach @LMBernardo
🐛 Fix TFT touch buttons, button colors (MarlinFirmware#25300)
0658e61
thinkyhead pushed a commit that referenced this pull request Apr 7, 2023
@alexgrach @thinkyhead
🐛 Fix TFT touch buttons, button colors (#25300)
30f10ef
EvilGremlin pushed a commit to EvilGremlin/Marlin that referenced this pull request Apr 8, 2023
@alexgrach @EvilGremlin
🐛 Fix TFT touch buttons, button colors (MarlinFirmware#25300)
e0a45a5
thinkyhead pushed a commit that referenced this pull request Apr 10, 2023
@alexgrach @thinkyhead
🐛 Fix TFT touch buttons, button colors (#25300)
0cb2ced
thinkyhead pushed a commit to thinkyhead/Marlin that referenced this pull request May 16, 2023
@alexgrach @thinkyhead
🐛 Fix TFT touch buttons, button colors (MarlinFirmware#25300)
a937f9e
EvilGremlin pushed a commit to EvilGremlin/Marlin that referenced this pull request May 17, 2023
@alexgrach @EvilGremlin
🐛 Fix TFT touch buttons, button colors (MarlinFirmware#25300)
1fdc862
tspiva pushed a commit to tspiva/Marlin that referenced this pull request May 25, 2023
@alexgrach
🐛 Fix TFT touch buttons, button colors (MarlinFirmware#25300)
a922eb0
Andy-Big pushed a commit to Andy-Big/Marlin_FB_Reborn that referenced this pull request Jul 9, 2023
@alexgrach @Andy-Big
🐛 Fix TFT touch buttons, button colors (MarlinFirmware#25300)
4d52a59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
C: LCD & Controllers PR: Bug Fix PR: Improvement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@alexgrach @tpruvot @thinkyhead @thisiskeithb