Browse Source

Fix some DOGM warnings (#16363)

Jason Smith 4 years ago
parent
commit
92ad973729

+ 1
- 1
Marlin/src/lcd/dogm/dogm_Statusscreen.h View File

1368
     #define STATUS_LOGO_X 0
1368
     #define STATUS_LOGO_X 0
1369
   #endif
1369
   #endif
1370
   #ifndef STATUS_LOGO_Y
1370
   #ifndef STATUS_LOGO_Y
1371
-    #define STATUS_LOGO_Y _MIN(0, 10 - (STATUS_LOGO_HEIGHT) / 2)
1371
+    #define STATUS_LOGO_Y _MIN(0U, (10 - (STATUS_LOGO_HEIGHT) / 2))
1372
   #endif
1372
   #endif
1373
   #ifndef STATUS_LOGO_HEIGHT
1373
   #ifndef STATUS_LOGO_HEIGHT
1374
     #define STATUS_LOGO_HEIGHT (sizeof(status_logo_bmp) / (STATUS_LOGO_BYTEWIDTH))
1374
     #define STATUS_LOGO_HEIGHT (sizeof(status_logo_bmp) / (STATUS_LOGO_BYTEWIDTH))

+ 4
- 2
Marlin/src/lcd/dogm/status_screen_DOGM.cpp View File

235
       UNUSED(blink);
235
       UNUSED(blink);
236
     #endif
236
     #endif
237
 
237
 
238
-    const bool isHeat = BED_ALT();
239
-
240
     const uint8_t tx = STATUS_BED_TEXT_X;
238
     const uint8_t tx = STATUS_BED_TEXT_X;
241
 
239
 
242
     const float temp = thermalManager.degBed(),
240
     const float temp = thermalManager.degBed(),
243
               target = thermalManager.degTargetBed();
241
               target = thermalManager.degTargetBed();
244
 
242
 
243
+    #if ENABLED(STATUS_HEAT_PERCENT) || (DO_DRAW_BED && DISABLED(STATUS_BED_ANIM))
244
+      const bool isHeat = BED_ALT();
245
+    #endif
246
+
245
     #if DO_DRAW_BED && DISABLED(STATUS_BED_ANIM)
247
     #if DO_DRAW_BED && DISABLED(STATUS_BED_ANIM)
246
       #define STATIC_BED    true
248
       #define STATIC_BED    true
247
       #define BED_DOT       isHeat
249
       #define BED_DOT       isHeat

Loading…
Cancel
Save