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

320x240 LCD portrait mode UI #25207

Merged
merged 12 commits into from
Jan 17, 2023
Merged

320x240 LCD portrait mode UI #25207

merged 12 commits into from
Jan 17, 2023

Conversation

alexgrach
Copy link
Contributor

@alexgrach alexgrach commented Jan 7, 2023 •
edited by thinkyhead
Loading

Description

320x240 LCD portrait mode UI.

Requirements

MKS Robin Nano, MKS Robin TFT 2,8"

Benefits

No additional resolution.

#if TFT_ROTATION == TFT_ROTATE_90 || TFT_ROTATION == TFT_ROTATE_90_MIRROR_X \
  || TFT_ROTATION == TFT_ROTATE_90_MIRROR_Y || TFT_ROTATION == TFT_ROTATE_270 \
  || TFT_ROTATION == TFT_ROTATE_270_MIRROR_X || TFT_ROTATION == TFT_ROTATE_270_MIRROR_Y

does not work correctly at Conditionals_LCD.h but works at tft.h.

#define TFT_COLOR_UI_PORTRAIT is used for now.

Configurations

Configuration_kp3s.zip

Related Issues

#25191

@alexgrach
320x240 LCD portrait mode UI
a82fbc4
@alexgrach
Merge branch 'jmz52:bugfix-2.1.x' into bugfix-2.1.x
f3811fc
@alexgrach
Merge branch 'bugfix-2.1.x' of https://github.com/alexgrach/Marlin in…
4e6b9be 
…to bugfix-2.1.x
@alexgrach
320x240 LCD portrait mode UI rework
796acad
@alexgrach
Update ui_320x240.cpp
d8ba094
@alexgrach
define TFT_COLOR_UI_PORTRAIT for portrait orientation
2c74305 
#if TFT_ROTATION == TFT_ROTATE_90 || TFT_ROTATION == TFT_ROTATE_90_MIRROR_X || TFT_ROTATION == TFT_ROTATE_90_MIRROR_Y || TFT_ROTATION == TFT_ROTATE_270 || TFT_ROTATION == TFT_ROTATE_270_MIRROR_X || TFT_ROTATION == TFT_ROTATE_270_MIRROR_Y
Does not work correctly at Conditionals_LCD.h
@alexgrach
Update tft.h
a1ee515 
whitespece deleted
@alexgrach
Update pins_MKS_ROBIN_MINI.h
f3eafdf
@alexgrach alexgrach mentioned this pull request Jan 7, 2023
Closed
@thinkyhead
Copy link
Member

This is much cleaner. Maybe we should use TFT_ROTATION as the basis to display the screen as landscape or portrait. That assumes that the 240x320 display has to be initialized to draw in portrait mode versus a native landscape mode, meaning it should also be able to do upside-down orientations also. If that is the case with this display then we can use TFT_ROTATION to set up both the display init and choose whether to set a TFT_COLOR_UI_PORTRAIT flag. However, if the native resolution of the display is 240x320, then we can just add a top level TFT_RES_240x320 option and set a TFT_COLOR_UI_PORTRAIT flag based on that instead.

@thinkyhead
Copy link
Member

thinkyhead commented Jan 8, 2023 •
edited
Loading

does not work correctly at Conditionals_LCD.h but works at tft.h.

Files that need to check the value of TFT_ROTATION will need to define the items defined in tft_io.h such as TFT_NO_ROTATION or move these defines where they are needed for evaluation. Alternatively, the value of TFT_ROTATION can be tested using dummy values, as in:

#define _CMP_TFT_NO_ROTATION 0x01
#define _CMP_TFT_ROTATE_90 0x90
#define _CMP_TFT_ROTATE_180 0x180
// etc.
#define _ISROT(N) || (_CAT(_CMP_, TFT_ROTATION) == _CAT(_CMP_, N))
#define ISROT(V...) (0 MAP(_ISROT, V))

#ifndef TFT_ROTATION
  #define TFT_ROTATION TFT_NO_ROTATION
#endif

#if ISROT(TFT_NO_ROTATION)
  #warning "TFT no rotation is selected."
#elif ISROT(TFT_ROTATE_90, TFT_ROTATE_180)
  #warning "TFT rotation is either 90 or 180."
#endif

#undef _CMP_TFT_NO_ROTATION
#undef _CMP_TFT_ROTATE_90
#undef _CMP_TFT_ROTATE_180

@thinkyhead
Copy link
Member

The PR at alexgrach#2 adds a test to set the TFT_COLOR_UI_PORTRAIT flag based on TFT_ROTATION. It's not exactly pretty, but it should work. Please merge that PR and then afterward you can make any needed adjustments and push new commits to update this PR.

@alexgrach
Copy link
Contributor Author

Should I return TFT_RES_240x320 definition?

@thinkyhead
Copy link
Member

Should I return TFT_RES_240x320 definition?

The consensus from other contributors was to have a single screen size but use TFT_ROTATION to pick the portrait orientation, so that is how this is currently implemented.

@alexgrach
Update Conditionals_LCD.h
2f394ad 
TFT_COLOR_UI_PORTRAIT flag
@alexgrach
Copy link
Contributor Author

Setting the TFT_COLOR_UI_PORTRAIT flag works correctly.

@thinkyhead thinkyhead merged commit 6fb145f into MarlinFirmware:bugfix-2.1.x Jan 17, 2023
thinkyhead added a commit that referenced this pull request Jan 17, 2023
@alexgrach @thinkyhead
✨ TFT 320x240 portrait (#25207)
99d1b04 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
@alexgrach
Copy link
Contributor Author

PR does not include last changes to tft_io.h and Conditionals_LCD.h

@alexgrach alexgrach mentioned this pull request Jan 19, 2023
Closed
@Bob-the-Kuhn Bob-the-Kuhn mentioned this pull request Jan 21, 2023
Closed
@alexgrach alexgrach mentioned this pull request Jan 25, 2023
Merged
@mjbogusz mjbogusz mentioned this pull request Jan 29, 2023
Merged
5 tasks
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 <85784399+uBaHoFF@users.noreply.github.com>
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 <rhapsodyv@gmail.com>
Date:   Sat Feb 4 05:10:26 2023 -0300

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

commit 08d9cbb
Author: vyacheslav-shubin <shubin-vv@krista.ru>
Date:   Sat Feb 4 10:36:07 2023 +0300

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

commit 7c0b465
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Fri Feb 3 06:06:11 2023 +0000

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

commit cea176a
Author: Martin Turski <quiret@vfemail.net>
Date:   Fri Feb 3 04:01:22 2023 +0100

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

commit cb7af50
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Thu Feb 2 17:41:46 2023 -0800

    📝 Fix Z*_ENDSTOP_ADJUSTMENT comments (MarlinFirmware#25295)

commit a80036e
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Thu Feb 2 00:23:18 2023 +0000

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

commit 8f11428
Author: kg333 <matthew@kyengineer.com>
Date:   Wed Feb 1 19:02:26 2023 -0500

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

commit 3be967b
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Feb 1 02:19:47 2023 -0600

    🩹 PID / MPC heating followup

    Followup to MarlinFirmware#25314

commit 57a7e28
Author: Bob Kuhn <bob.kuhn@att.net>
Date:   Wed Feb 1 02:43:06 2023 -0600

    🩹 Fix progress DOGM compile error (MarlinFirmware#25319)

commit 64338df
Author: Bob Kuhn <bob.kuhn@att.net>
Date:   Wed Feb 1 01:51:11 2023 -0600

    🔧 Fix SD sorting sanity checks (MarlinFirmware#25318)

commit fbe9237
Author: alexgrach <gav@bmstu.ru>
Date:   Wed Feb 1 10:40:13 2023 +0300

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

commit d6f4f24
Author: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date:   Wed Feb 1 07:25:13 2023 +0000

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

    Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

commit aae103e
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Wed Feb 1 00:25:54 2023 +0000

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

commit 738f0a1
Author: Dan Royer <dan@marginallyclever.com>
Date:   Mon Jan 30 22:12:03 2023 -0800

    ✨ POLARGRAPH / PEN_UP_DOWN_MENU (MarlinFirmware#25303)

    Co-authored-by: Dan Royer <1464454+i-make-robots@users.noreply.github.com>

commit 5446968
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 31 06:05:55 2023 +0000

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

commit 2dda0c0
Author: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date:   Tue Jan 31 06:07:51 2023 +0100

    🌐 Update Italian language (MarlinFirmware#25309)

commit 7ad3586
Author: Roman Moravčík <roman.moravcik@gmail.com>
Date:   Tue Jan 31 06:07:03 2023 +0100

    🌐 Update Slovak language (MarlinFirmware#25305)

commit 087e19a
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Jan 30 22:11:50 2023 -0600

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

commit d0a965a
Author: Darren Garnier <dgarnier@reinrag.net>
Date:   Mon Jan 30 23:00:49 2023 -0500

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

commit 0c181fc
Author: Bob Kuhn <bob.kuhn@att.net>
Date:   Mon Jan 30 21:57:36 2023 -0600

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

commit 67bc855
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Fri Jan 27 00:27:06 2023 +0000

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

commit ab767a4
Author: alexgrach <gav@bmstu.ru>
Date:   Fri Jan 27 03:20:09 2023 +0300

    🐛 Fix TFT Color UI LCD_HEIGHT (MarlinFirmware#25281)

commit 0e748da
Author: xBiohazardx <36756950+xBiohazardx@users.noreply.github.com>
Date:   Fri Jan 27 01:05:04 2023 +0100

    ✏️ Fix probe invert flag (MarlinFirmware#25282)

commit 2637153
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Thu Jan 26 06:05:55 2023 +0000

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

commit a2c93c2
Author: avionix-g <63542699+avionix-g@users.noreply.github.com>
Date:   Wed Jan 25 23:14:52 2023 -0500

    🐛 Fix MKS board Ultipanel support (MarlinFirmware#25278)

commit 4f902ac
Author: Alexander Gavrilenko <jmz52@users.noreply.github.com>
Date:   Thu Jan 26 07:05:43 2023 +0300

    🐛 Fix Simulator TFT compile (MarlinFirmware#25279)

commit cf02107
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Jan 25 21:37:10 2023 -0600

    🔧 Refine Input Shaping check (MarlinFirmware#25280)

commit 7a49fab
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 24 12:07:25 2023 +0000

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

commit 7393285
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Jan 20 21:17:13 2023 -0600

    SDIO retry, hsd clock, etc.

commit e0ae072
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 24 02:21:02 2023 -0600

    🔧 Overridable Stepper EN init

commit 4099763
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Mon Jan 23 12:07:26 2023 +0000

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

commit 3268897
Author: Bob Kuhn <bob.kuhn@att.net>
Date:   Mon Jan 23 01:37:35 2023 -0600

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

commit fffc966
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Jan 23 01:22:03 2023 -0600

    🐛 Fix homing_needed_error bits

commit e656f10
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Sun Jan 22 06:05:45 2023 +0000

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

commit 7e72981
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Jan 21 22:57:56 2023 -0600

    🚸 Fix homing_needed_error language

commit b7c2363
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Sun Jan 22 15:08:37 2023 +1300

    🐛 Fix misc. UI issues (MarlinFirmware#25252)

    Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

commit f2b8942
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Wed Jan 18 00:22:56 2023 +0000

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

commit f81c468
Author: John Robertson <john@cirtech.co.uk>
Date:   Tue Jan 17 23:53:39 2023 +0000

    🐛 Fix potential I2S buffer overwrite (MarlinFirmware#25113)

commit b3f65b6
Author: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
Date:   Tue Jan 17 18:41:36 2023 -0500

    🚸 ProUI MPC menu (MarlinFirmware#25232)

    Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

commit 99d1b04
Author: alexgrach <gav@bmstu.ru>
Date:   Wed Jan 18 02:37:19 2023 +0300

    ✨ TFT 320x240 portrait (MarlinFirmware#25207)

    Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

commit 58f64ea
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 17 06:05:52 2023 +0000

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

commit c448208
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Jan 16 22:11:49 2023 -0600

    🎨 Heading cleanup

commit 938d7b5
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Mon Jan 16 00:22:07 2023 +0000

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

commit 6fe387b
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Jan 15 06:48:17 2023 -0600

    🧑‍💻 Adjust PID / MPC / ProUI

    Changes to simplify MarlinFirmware#25232 WIP

commit d94defc
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Jan 15 06:48:17 2023 -0600

    🎨 Language / menu cleanup

commit 212167b
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Sun Jan 15 05:25:36 2023 -0800

    📝 No longer experimental (MarlinFirmware#25238)

commit d753781
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Sun Jan 15 12:06:24 2023 +0000

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

commit da87c20
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Jan 15 01:19:45 2023 -0600

    🔖  Config version 02010300

commit 5acf738
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Jan 15 01:11:49 2023 -0600

    🔧 Added MOTHERBOARD error text

commit 80a2555
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Sat Jan 14 18:05:38 2023 +0000

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

commit 5fd5cb0
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Jan 14 07:44:57 2023 -0600

    ✏️  ProUI followup

commit 7503ac3
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Fri Jan 13 00:22:51 2023 +0000

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

commit 80dc7b2
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Jan 11 20:31:46 2023 -0600

    🔧 Input Shaping sanity checks

commit 3d0b11a
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Thu Jan 12 01:39:45 2023 +0000

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

commit 73fa199
Merge: 6444761 0838f70
Author: uBaHoFF <85784399+uBaHoFF@users.noreply.github.com>
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 <thinkyhead@users.noreply.github.com>
Date:   Wed Jan 11 01:19:54 2023 -0600

    🩹 Fix Sim with USE_WATCHDOG disabled

commit 5af5c2a
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Jan 11 01:19:45 2023 -0600

    🔨 Improve config.ini parser

commit fe62c80
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Wed Jan 11 06:24:37 2023 +0000

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

commit 64167df
Author: Powerlated <zjia08@gmail.com>
Date:   Wed Jan 11 00:40:15 2023 -0500

    ✨ PREHEAT_TIME_BED_MS (MarlinFirmware#25146)

commit 250fd60
Author: Alex Z <ad_user@runbox.com>
Date:   Wed Jan 11 15:22:28 2023 +1000

    🐛 Fix Chitu V6 Z_STOP_PIN (MarlinFirmware#25227)

commit 01e58de
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 10 22:38:08 2023 -0600

    🩹 ProUI - Remove ManualZOffset

commit 7717beb
Author: kadir ilkimen <kadirilkimen@gmail.com>
Date:   Wed Jan 11 06:29:38 2023 +0200

    ✨ Polar Kinematics (MarlinFirmware#25214)

commit 33e5aad
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 10 01:41:43 2023 +0000

    [cron] Bump distribution date (2023-01-10)
@derTimm0 derTimm0 mentioned this pull request Feb 14, 2023
Open
thinkyhead added a commit to thinkyhead/Marlin that referenced this pull request Feb 22, 2023
@alexgrach @thinkyhead
✨ TFT 320x240 portrait (MarlinFirmware#25207)
ef2c0d7 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
thinkyhead added a commit that referenced this pull request Apr 7, 2023
@alexgrach @thinkyhead
✨ TFT 320x240 portrait (#25207)
d1a369d 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
thinkyhead added a commit that referenced this pull request Apr 10, 2023
@alexgrach @thinkyhead
✨ TFT 320x240 portrait (#25207)
e5bdfe9 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
thinkyhead added a commit to thinkyhead/Marlin that referenced this pull request May 16, 2023
@alexgrach @thinkyhead
✨ TFT 320x240 portrait (MarlinFirmware#25207)
1b0e690 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
EvilGremlin pushed a commit to EvilGremlin/Marlin that referenced this pull request May 17, 2023
@alexgrach @thinkyhead @EvilGremlin
✨ TFT 320x240 portrait (MarlinFirmware#25207)
9323513 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
tspiva pushed a commit to tspiva/Marlin that referenced this pull request May 25, 2023
@alexgrach @thinkyhead
✨ TFT 320x240 portrait (MarlinFirmware#25207)
566128f 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
@uncellon uncellon mentioned this pull request Jun 7, 2023
Merged
Andy-Big pushed a commit to Andy-Big/Marlin_FB_Reborn that referenced this pull request Jul 9, 2023
@alexgrach @thinkyhead @Andy-Big
✨ TFT 320x240 portrait (MarlinFirmware#25207)
cce409f 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
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: Improvement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@alexgrach @thinkyhead