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

Small / Large Boot Screen option for TFT_COLOR_UI follow-up #20583

Conversation

thisiskeithb
Copy link
Member

@thisiskeithb thisiskeithb commented Dec 28, 2020

Description

Quick follow-up so TFT_CLASSIC_UI (TFT_SCALED_DOGLCD) is also included in BOOT_MARLIN_LOGO_SMALL check.

Benefits

The BOOT_MARLIN_LOGO_SMALL setting will now be honored when TFT_CLASSIC_UI is enabled. Simply comment it out to use the the old/large bootscreen.

Just to confirm that everything works as expected, I tested it with the following:

  • A real REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
  • TFT_CLASSIC_UI (TFT_SCALED_DOGLCD)
  • TFT_COLOR_UI

Related Issues

#20578 (comment)

@tpruvot
Copy link
Contributor

tpruvot commented Dec 28, 2020

no no, it was working, its the reverse :p no way to put/keep the big one... seems only a problem with the colored bitmaps... much bigger

@thisiskeithb
Copy link
Member Author

thisiskeithb commented Dec 28, 2020

no no, it was working, its the reverse :p no way to put/keep the big one...

Using the updated ANY() check from this PR, can't you just comment out BOOT_MARLIN_LOGO_SMALL?

#if ENABLED(BOOT_MARLIN_LOGO_SMALL)
#define START_BMPWIDTH 56
const unsigned char start_bmp[] PROGMEM = {
B00011111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
B01100000,B00000000,B00000000,B00000000,B00000000,B00000001,B11111111,

@tpruvot
Copy link
Contributor

tpruvot commented Dec 28, 2020

just #if ENABLED(TFT_COLOR_UI) is required so... maybe LVGL one too, later but i dont know this one yet.

@thisiskeithb
Copy link
Member Author

maybe LVGL one too, later but i dont know this one yet.

LVGL has it's own image for a bootscreen, so it's not affected by Marlin's bootscreen settings.

@tpruvot
Copy link
Contributor

tpruvot commented Dec 28, 2020

TFT_SCALED_DOGLCD is already set by HAS_MARLINUI_U8GLIB
the change is not useful ... well its using u8g (dogm) else yea, i could just comment but i want to let the users the choice of the ui... in a simple switch

was an "undef" on my local commit tpruvot@79543d0#diff-c7a3fa925098d81e51840820898b66e3d3e48f121a83e4d0b6c65e5ab4f2fba0R1156

@thisiskeithb
Copy link
Member Author

TFT_SCALED_DOGLCD is already set by HAS_MARLINUI_U8GLIB
the change is not useful ... well its using u8g (dogm)

You sure about that 🙂 I just tested my PR on an ET5 with a TFT35 and it works as expected.

Leaving BOOT_MARLIN_LOGO_SMALL enabled will give you the small bootscreen.

Commenting out BOOT_MARLIN_LOGO_SMALL will give you the normal/large bootscreen.

@tpruvot
Copy link
Contributor

tpruvot commented Dec 28, 2020

yep, i could comment but in this case i need to uncomment on COLOR_UI switch :p

@tpruvot
Copy link
Contributor

tpruvot commented Dec 28, 2020

there is another one bugging me on the switch, had to add that :

#if ENABLED(TFT_COLOR_UI)
 #undef CUSTOM_STATUS_SCREEN_IMAGE // only in Classic UI

@tpruvot
Copy link
Contributor

tpruvot commented Dec 28, 2020

by simple switch i mean there in Marlin/Configuration.h

/**
 * TFT UI - User Interface Selection. Enable one of the following options:
 *
 *   TFT_CLASSIC_UI - Emulated DOGM - 128x64 Upscaled
 *   TFT_COLOR_UI   - Marlin Default Menus, Touch Friendly, using full TFT capabilities
 *   TFT_LVGL_UI    - A Modern UI using LVGL
 *
 *   For LVGL_UI also copy the 'assets' folder from the build directory to the
 *   root of your SD card, together with the compiled firmware.
 */
//#define TFT_CLASSIC_UI
#define TFT_COLOR_UI
//#define TFT_LVGL_UI

@thisiskeithb
Copy link
Member Author

there is another one bugging me on the switch, had to add that :

#if ENABLED(TFT_COLOR_UI)
 #undef CUSTOM_STATUS_SCREEN_IMAGE // only in Classic UI

I'm sorry, but what does that have to do with this PR?

Please undo custom changes to your fork & confirm that my PR fixes the bootscreen sizes without muddying the main issue.

@thisiskeithb
Copy link
Member Author

thisiskeithb commented Dec 28, 2020

I've confirmed using a full graphics LCD as well as an emulated full graphics LCD (with TFT_CLASSIC_UI & TFT_COLOR_UI) uses the correct bootscreen size depending on if you leave BOOT_MARLIN_LOGO_SMALL enabled or disabled.

@tpruvot
Copy link
Contributor

tpruvot commented Dec 28, 2020

@tpruvot
Copy link
Contributor

tpruvot commented Dec 28, 2020

to return on this PR topic... it was already small by default for TFT_CLASSIC_UI with the commit merged yesterday

@thisiskeithb
Copy link
Member Author

I have no idea what you're trying to point out.

Please put in a separate PR to fix whatever issue you've found.

@thisiskeithb thisiskeithb deleted the pr/bootscreen_follow-up branch December 28, 2020 15:17
@thisiskeithb thisiskeithb removed the request for review from rhapsodyv December 28, 2020 15:20
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.

2 participants