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

Only compile TFT_COLOR_UI bootscreen if enabled #20586

Merged
merged 8 commits into from
Dec 29, 2020
Merged

Only compile TFT_COLOR_UI bootscreen if enabled #20586

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ad767da
Only compile TFT_COLOR_UI bootscreen if enabled
thisiskeithb Dec 28, 2020
14ec916
Wrap some more variables
thisiskeithb Dec 28, 2020
05c865e
Include MarlinConfigPre
thisiskeithb Dec 28, 2020
bdb757b
Drop IS_ANET_ET
thisiskeithb Dec 28, 2020
e118a48
align
thinkyhead Dec 29, 2020
d9d1a9c
Update tft_image.h
thinkyhead Dec 29, 2020
c3f9193
Update ui_320x240.h
thinkyhead Dec 29, 2020
1d380cd
Update ui_480x320.h
thinkyhead Dec 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions Marlin/src/lcd/tft/tft_image.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,14 @@

const tImage NoLogo = { nullptr, 0, 0, NOCOLORS };

const tImage MarlinLogo112x38x1 = { (void *)marlin_logo_112x38x1, 112, 38, GREYSCALE1 };
const tImage MarlinLogo228x255x2 = { (void *)marlin_logo_228x255x2, 228, 255, GREYSCALE2 };
const tImage MarlinLogo228x255x4 = { (void *)marlin_logo_228x255x4, 228, 255, GREYSCALE4 };
const tImage MarlinLogo195x59x16 = { (void *)marlin_logo_195x59x16, 195, 59, HIGHCOLOR };
const tImage MarlinLogo320x240x16 = { (void *)marlin_logo_320x240x16, 320, 240, HIGHCOLOR };
const tImage MarlinLogo480x320x16 = { (void *)marlin_logo_480x320x16, 480, 320, HIGHCOLOR };
#if ENABLED(SHOW_BOOTSCREEN)
const tImage MarlinLogo112x38x1 = { (void *)marlin_logo_112x38x1, 112, 38, GREYSCALE1 };
const tImage MarlinLogo228x255x2 = { (void *)marlin_logo_228x255x2, 228, 255, GREYSCALE2 };
const tImage MarlinLogo228x255x4 = { (void *)marlin_logo_228x255x4, 228, 255, GREYSCALE4 };
const tImage MarlinLogo195x59x16 = { (void *)marlin_logo_195x59x16, 195, 59, HIGHCOLOR };
const tImage MarlinLogo320x240x16 = { (void *)marlin_logo_320x240x16, 320, 240, HIGHCOLOR };
const tImage MarlinLogo480x320x16 = { (void *)marlin_logo_480x320x16, 480, 320, HIGHCOLOR };
#endif
const tImage Background320x30x16 = { (void *)background_320x30x16, 320, 30, HIGHCOLOR };
thinkyhead marked this conversation as resolved.
Show resolved Hide resolved

const tImage HotEnd_64x64x4 = { (void *)hotend_64x64x4, 64, 64, GREYSCALE4 };
Expand Down
14 changes: 8 additions & 6 deletions Marlin/src/lcd/tft/tft_image.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,14 @@ typedef struct __attribute__((__packed__)) {

extern const tImage NoLogo;

extern const tImage MarlinLogo112x38x1;
extern const tImage MarlinLogo228x255x2;
extern const tImage MarlinLogo228x255x4;
extern const tImage MarlinLogo195x59x16;
extern const tImage MarlinLogo320x240x16;
extern const tImage MarlinLogo480x320x16;
#if ENABLED(SHOW_BOOTSCREEN)
extern const tImage MarlinLogo112x38x1;
extern const tImage MarlinLogo228x255x2;
extern const tImage MarlinLogo228x255x4;
extern const tImage MarlinLogo195x59x16;
extern const tImage MarlinLogo320x240x16;
extern const tImage MarlinLogo480x320x16;
#endif
extern const tImage Background320x30x16;

extern const tImage HotEnd_64x64x4;
Expand Down
6 changes: 5 additions & 1 deletion Marlin/src/lcd/tft/ui_320x240.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@ void menu_item(const uint8_t row, bool sel = false);
#define ABSOLUTE_ZERO -273.15

const tImage Images[imgCount] = {
TERN(BOOT_MARLIN_LOGO_SMALL, MarlinLogo195x59x16, MarlinLogo320x240x16),
#if ENABLED(SHOW_BOOTSCREEN)
TERN(BOOT_MARLIN_LOGO_SMALL, MarlinLogo195x59x16, MarlinLogo320x240x16),
#else
NoLogo,
#endif
HotEnd_64x64x4,
Bed_64x64x4,
Bed_Heated_64x64x4,
Expand Down
6 changes: 5 additions & 1 deletion Marlin/src/lcd/tft/ui_480x320.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@ void menu_item(const uint8_t row, bool sel = false);
#define ABSOLUTE_ZERO -273.15

const tImage Images[imgCount] = {
TERN(BOOT_MARLIN_LOGO_SMALL, MarlinLogo195x59x16, MarlinLogo480x320x16),
#if ENABLED(SHOW_BOOTSCREEN)
TERN(BOOT_MARLIN_LOGO_SMALL, MarlinLogo195x59x16, MarlinLogo480x320x16),
#else
NoLogo,
#endif
HotEnd_64x64x4,
Bed_64x64x4,
Bed_Heated_64x64x4,
Expand Down