Browse Source

Apply SHOW_BOOTSCREEN to TFT_COLOR_UI (#20586)

Keith Bennett 4 years ago
parent
commit
aff4fccfc3
No account linked to committer's email address

+ 0
- 4
Marlin/src/inc/Conditionals_LCD.h View File

1197
     #define TOUCH_ORIENTATION    TOUCH_LANDSCAPE
1197
     #define TOUCH_ORIENTATION    TOUCH_LANDSCAPE
1198
   #endif
1198
   #endif
1199
 #endif
1199
 #endif
1200
-
1201
-#if MB(ANET_ET4, ANET_ET4P)
1202
-  #define IS_ANET_ET 1
1203
-#endif

+ 8
- 6
Marlin/src/lcd/tft/tft_image.cpp View File

25
 
25
 
26
 const tImage NoLogo                 = { nullptr, 0, 0, NOCOLORS };
26
 const tImage NoLogo                 = { nullptr, 0, 0, NOCOLORS };
27
 
27
 
28
-const tImage MarlinLogo112x38x1     = { (void *)marlin_logo_112x38x1, 112, 38, GREYSCALE1 };
29
-const tImage MarlinLogo228x255x2    = { (void *)marlin_logo_228x255x2, 228, 255, GREYSCALE2 };
30
-const tImage MarlinLogo228x255x4    = { (void *)marlin_logo_228x255x4, 228, 255, GREYSCALE4 };
31
-const tImage MarlinLogo195x59x16    = { (void *)marlin_logo_195x59x16,  195,  59, HIGHCOLOR };
32
-const tImage MarlinLogo320x240x16   = { (void *)marlin_logo_320x240x16, 320, 240, HIGHCOLOR };
33
-const tImage MarlinLogo480x320x16   = { (void *)marlin_logo_480x320x16, 480, 320, HIGHCOLOR };
28
+#if ENABLED(SHOW_BOOTSCREEN)
29
+  const tImage MarlinLogo112x38x1   = { (void *)marlin_logo_112x38x1, 112, 38, GREYSCALE1 };
30
+  const tImage MarlinLogo228x255x2  = { (void *)marlin_logo_228x255x2, 228, 255, GREYSCALE2 };
31
+  const tImage MarlinLogo228x255x4  = { (void *)marlin_logo_228x255x4, 228, 255, GREYSCALE4 };
32
+  const tImage MarlinLogo195x59x16  = { (void *)marlin_logo_195x59x16,  195,  59, HIGHCOLOR };
33
+  const tImage MarlinLogo320x240x16 = { (void *)marlin_logo_320x240x16, 320, 240, HIGHCOLOR };
34
+  const tImage MarlinLogo480x320x16 = { (void *)marlin_logo_480x320x16, 480, 320, HIGHCOLOR };
35
+#endif
34
 const tImage Background320x30x16    = { (void *)background_320x30x16, 320, 30, HIGHCOLOR };
36
 const tImage Background320x30x16    = { (void *)background_320x30x16, 320, 30, HIGHCOLOR };
35
 
37
 
36
 const tImage HotEnd_64x64x4         = { (void *)hotend_64x64x4, 64, 64, GREYSCALE4 };
38
 const tImage HotEnd_64x64x4         = { (void *)hotend_64x64x4, 64, 64, GREYSCALE4 };

+ 9
- 7
Marlin/src/lcd/tft/tft_image.h View File

22
 #pragma once
22
 #pragma once
23
 
23
 
24
 #include "stdint.h"
24
 #include "stdint.h"
25
-
25
+#include "../../inc/MarlinConfigPre.h"
26
 
26
 
27
 extern const uint8_t marlin_logo_112x38x1[];
27
 extern const uint8_t marlin_logo_112x38x1[];
28
 extern const uint8_t marlin_logo_228x255x2[];
28
 extern const uint8_t marlin_logo_228x255x2[];
120
 
120
 
121
 extern const tImage NoLogo;
121
 extern const tImage NoLogo;
122
 
122
 
123
-extern const tImage MarlinLogo112x38x1;
124
-extern const tImage MarlinLogo228x255x2;
125
-extern const tImage MarlinLogo228x255x4;
126
-extern const tImage MarlinLogo195x59x16;
127
-extern const tImage MarlinLogo320x240x16;
128
-extern const tImage MarlinLogo480x320x16;
123
+#if ENABLED(SHOW_BOOTSCREEN)
124
+  extern const tImage MarlinLogo112x38x1;
125
+  extern const tImage MarlinLogo228x255x2;
126
+  extern const tImage MarlinLogo228x255x4;
127
+  extern const tImage MarlinLogo195x59x16;
128
+  extern const tImage MarlinLogo320x240x16;
129
+  extern const tImage MarlinLogo480x320x16;
130
+#endif
129
 extern const tImage Background320x30x16;
131
 extern const tImage Background320x30x16;
130
 
132
 
131
 extern const tImage HotEnd_64x64x4;
133
 extern const tImage HotEnd_64x64x4;

+ 1
- 1
Marlin/src/lcd/tft/ui_320x240.h View File

44
 #define ABSOLUTE_ZERO     -273.15
44
 #define ABSOLUTE_ZERO     -273.15
45
 
45
 
46
 const tImage Images[imgCount] = {
46
 const tImage Images[imgCount] = {
47
-  TERN(BOOT_MARLIN_LOGO_SMALL, MarlinLogo195x59x16, MarlinLogo320x240x16),
47
+  TERN(SHOW_BOOTSCREEN, TERN(BOOT_MARLIN_LOGO_SMALL, MarlinLogo195x59x16, MarlinLogo320x240x16), NoLogo),
48
   HotEnd_64x64x4,
48
   HotEnd_64x64x4,
49
   Bed_64x64x4,
49
   Bed_64x64x4,
50
   Bed_Heated_64x64x4,
50
   Bed_Heated_64x64x4,

+ 1
- 1
Marlin/src/lcd/tft/ui_480x320.h View File

44
 #define ABSOLUTE_ZERO     -273.15
44
 #define ABSOLUTE_ZERO     -273.15
45
 
45
 
46
 const tImage Images[imgCount] = {
46
 const tImage Images[imgCount] = {
47
-  TERN(BOOT_MARLIN_LOGO_SMALL, MarlinLogo195x59x16, MarlinLogo480x320x16),
47
+  TERN(SHOW_BOOTSCREEN, TERN(BOOT_MARLIN_LOGO_SMALL, MarlinLogo195x59x16, MarlinLogo480x320x16), NoLogo),
48
   HotEnd_64x64x4,
48
   HotEnd_64x64x4,
49
   Bed_64x64x4,
49
   Bed_64x64x4,
50
   Bed_Heated_64x64x4,
50
   Bed_Heated_64x64x4,

Loading…
Cancel
Save