From 92ad97372973a770cce2ee34fd131482a3dd312b Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.inet@gmail.com>
Date: Wed, 1 Jan 2020 19:58:16 -0800
Subject: [PATCH] Fix some DOGM warnings (#16363)
---
Marlin/src/lcd/dogm/dogm_Statusscreen.h | 2 +-
Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Marlin/src/lcd/dogm/dogm_Statusscreen.h b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
index f9bfd00cec..fbc7a8128a 100644
--- a/Marlin/src/lcd/dogm/dogm_Statusscreen.h
+++ b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
@@ -1368,7 +1368,7 @@
#define STATUS_LOGO_X 0
#endif
#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
#ifndef STATUS_LOGO_HEIGHT
#define STATUS_LOGO_HEIGHT (sizeof(status_logo_bmp) / (STATUS_LOGO_BYTEWIDTH))
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 2f6da518bd..bf2804d3a8 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -235,13 +235,15 @@ FORCE_INLINE void _draw_centered_temp(const int16_t temp, const uint8_t tx, cons
UNUSED(blink);
#endif
- const bool isHeat = BED_ALT();
-
const uint8_t tx = STATUS_BED_TEXT_X;
const float temp = thermalManager.degBed(),
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)
#define STATIC_BED true
#define BED_DOT isHeat
--
GitLab