zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix some DOGM warnings (#16363)

Browse source
This commit is contained in:
Jason Smith 2020-01-01 19:58:16 -08:00 committed by Scott Lahteine
parent 0be8b22d3c
commit 92ad973729
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/lcd/dogm/dogm_Statusscreen.h
View file

@ -1368,7 +1368,7 @@
#define STATUS_LOGO_X 0 #define STATUS_LOGO_X 0
#endif #endif
#ifndef STATUS_LOGO_Y #ifndef STATUS_LOGO_Y
#define STATUS_LOGO_Y _MIN(0, 10 - (STATUS_LOGO_HEIGHT) / 2) #define STATUS_LOGO_Y _MIN(0U, (10 - (STATUS_LOGO_HEIGHT) / 2))
#endif #endif
#ifndef STATUS_LOGO_HEIGHT #ifndef STATUS_LOGO_HEIGHT
#define STATUS_LOGO_HEIGHT (sizeof(status_logo_bmp) / (STATUS_LOGO_BYTEWIDTH)) #define STATUS_LOGO_HEIGHT (sizeof(status_logo_bmp) / (STATUS_LOGO_BYTEWIDTH))

6
Marlin/src/lcd/dogm/status_screen_DOGM.cpp
View file

@ -235,13 +235,15 @@ FORCE_INLINE void _draw_centered_temp(const int16_t temp, const uint8_t tx, cons
UNUSED(blink); UNUSED(blink);
#endif #endif
const bool isHeat = BED_ALT();
const uint8_t tx = STATUS_BED_TEXT_X; const uint8_t tx = STATUS_BED_TEXT_X;
const float temp = thermalManager.degBed(), const float temp = thermalManager.degBed(),
target = thermalManager.degTargetBed(); target = thermalManager.degTargetBed();
#if ENABLED(STATUS_HEAT_PERCENT) || (DO_DRAW_BED && DISABLED(STATUS_BED_ANIM))
const bool isHeat = BED_ALT();
#endif
#if DO_DRAW_BED && DISABLED(STATUS_BED_ANIM) #if DO_DRAW_BED && DISABLED(STATUS_BED_ANIM)
#define STATIC_BED true #define STATIC_BED true
#define BED_DOT isHeat #define BED_DOT isHeat