Keith Bennett
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with
19 additions and
19 deletions
-
Marlin/src/inc/Conditionals_LCD.h
-
Marlin/src/lcd/tft/tft_image.cpp
-
Marlin/src/lcd/tft/tft_image.h
-
Marlin/src/lcd/tft/ui_320x240.h
-
Marlin/src/lcd/tft/ui_480x320.h
|
|
@ -1197,7 +1197,3 @@ |
|
|
|
#define TOUCH_ORIENTATION TOUCH_LANDSCAPE |
|
|
|
#endif |
|
|
|
#endif |
|
|
|
|
|
|
|
#if MB(ANET_ET4, ANET_ET4P) |
|
|
|
#define IS_ANET_ET 1 |
|
|
|
#endif |
|
|
|
|
|
@ -25,12 +25,14 @@ |
|
|
|
|
|
|
|
const tImage NoLogo = { nullptr, 0, 0, NOCOLORS }; |
|
|
|
|
|
|
|
#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 }; |
|
|
|
|
|
|
|
const tImage HotEnd_64x64x4 = { (void *)hotend_64x64x4, 64, 64, GREYSCALE4 }; |
|
|
|
|
|
@ -22,7 +22,7 @@ |
|
|
|
#pragma once |
|
|
|
|
|
|
|
#include "stdint.h" |
|
|
|
|
|
|
|
#include "../../inc/MarlinConfigPre.h" |
|
|
|
|
|
|
|
extern const uint8_t marlin_logo_112x38x1[]; |
|
|
|
extern const uint8_t marlin_logo_228x255x2[]; |
|
|
@ -120,12 +120,14 @@ typedef struct __attribute__((__packed__)) { |
|
|
|
|
|
|
|
extern const tImage NoLogo; |
|
|
|
|
|
|
|
#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; |
|
|
|
|
|
@ -44,7 +44,7 @@ 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), |
|
|
|
TERN(SHOW_BOOTSCREEN, TERN(BOOT_MARLIN_LOGO_SMALL, MarlinLogo195x59x16, MarlinLogo320x240x16), NoLogo), |
|
|
|
HotEnd_64x64x4, |
|
|
|
Bed_64x64x4, |
|
|
|
Bed_Heated_64x64x4, |
|
|
|
|
|
@ -44,7 +44,7 @@ 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), |
|
|
|
TERN(SHOW_BOOTSCREEN, TERN(BOOT_MARLIN_LOGO_SMALL, MarlinLogo195x59x16, MarlinLogo480x320x16), NoLogo), |
|
|
|
HotEnd_64x64x4, |
|
|
|
Bed_64x64x4, |
|
|
|
Bed_Heated_64x64x4, |
|
|
|