Skip to content

Commit

Permalink
Wrap some more variables
Browse files Browse the repository at this point in the history
  • Loading branch information
thisiskeithb committed Dec 28, 2020
1 parent ad767da commit 14ec916
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 12 deletions.
14 changes: 8 additions & 6 deletions Marlin/src/lcd/tft/tft_image.cpp
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 };

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
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

0 comments on commit 14ec916

Please sign in to comment.