Bladeren bron

Fix some DOGM warnings (#16363)

Jason Smith 4 jaren geleden
bovenliggende
commit
92ad973729
2 gewijzigde bestanden met toevoegingen van 5 en 3 verwijderingen
  1. 1
    1
      Marlin/src/lcd/dogm/dogm_Statusscreen.h
  2. 4
    2
      Marlin/src/lcd/dogm/status_screen_DOGM.cpp

+ 1
- 1
Marlin/src/lcd/dogm/dogm_Statusscreen.h Bestand weergeven

@@ -1368,7 +1368,7 @@
1368 1368
     #define STATUS_LOGO_X 0
1369 1369
   #endif
1370 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 1372
   #endif
1373 1373
   #ifndef STATUS_LOGO_HEIGHT
1374 1374
     #define STATUS_LOGO_HEIGHT (sizeof(status_logo_bmp) / (STATUS_LOGO_BYTEWIDTH))

+ 4
- 2
Marlin/src/lcd/dogm/status_screen_DOGM.cpp Bestand weergeven

@@ -235,13 +235,15 @@ FORCE_INLINE void _draw_centered_temp(const int16_t temp, const uint8_t tx, cons
235 235
       UNUSED(blink);
236 236
     #endif
237 237
 
238
-    const bool isHeat = BED_ALT();
239
-
240 238
     const uint8_t tx = STATUS_BED_TEXT_X;
241 239
 
242 240
     const float temp = thermalManager.degBed(),
243 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 247
     #if DO_DRAW_BED && DISABLED(STATUS_BED_ANIM)
246 248
       #define STATIC_BED    true
247 249
       #define BED_DOT       isHeat

Laden…
Annuleren
Opslaan