Browse Source

Fix LCD cutter/bed icons overlapping (#16956)

InsanityAutomation 4 years ago
parent
commit
3e685777a8
No account linked to committer's email address
2 changed files with 2 additions and 1 deletions
  1. 1
    0
      Marlin/Configuration_adv.h
  2. 1
    1
      Marlin/src/lcd/dogm/dogm_Statusscreen.h

+ 1
- 0
Marlin/Configuration_adv.h View File

1260
   #define STATUS_HOTEND_ANIM          // Use a second bitmap to indicate hotend heating
1260
   #define STATUS_HOTEND_ANIM          // Use a second bitmap to indicate hotend heating
1261
   #define STATUS_BED_ANIM             // Use a second bitmap to indicate bed heating
1261
   #define STATUS_BED_ANIM             // Use a second bitmap to indicate bed heating
1262
   #define STATUS_CHAMBER_ANIM         // Use a second bitmap to indicate chamber heating
1262
   #define STATUS_CHAMBER_ANIM         // Use a second bitmap to indicate chamber heating
1263
+  //#define STATUS_CUTTER_ANIM        // Use a second bitmap to indicate spindle / laser active
1263
   //#define STATUS_ALT_BED_BITMAP     // Use the alternative bed bitmap
1264
   //#define STATUS_ALT_BED_BITMAP     // Use the alternative bed bitmap
1264
   //#define STATUS_ALT_FAN_BITMAP     // Use the alternative fan bitmap
1265
   //#define STATUS_ALT_FAN_BITMAP     // Use the alternative fan bitmap
1265
   //#define STATUS_FAN_FRAMES 3       // :[0,1,2,3,4] Number of fan animation frames
1266
   //#define STATUS_FAN_FRAMES 3       // :[0,1,2,3,4] Number of fan animation frames

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

1729
 
1729
 
1730
 #define DO_DRAW_LOGO (STATUS_LOGO_WIDTH && ENABLED(CUSTOM_STATUS_SCREEN_IMAGE))
1730
 #define DO_DRAW_LOGO (STATUS_LOGO_WIDTH && ENABLED(CUSTOM_STATUS_SCREEN_IMAGE))
1731
 #define DO_DRAW_HOTENDS (HOTENDS > 0)
1731
 #define DO_DRAW_HOTENDS (HOTENDS > 0)
1732
-#define DO_DRAW_CUTTER (HAS_CUTTER)
1733
 #define DO_DRAW_BED (HAS_HEATED_BED && STATUS_BED_WIDTH && HOTENDS <= 4)
1732
 #define DO_DRAW_BED (HAS_HEATED_BED && STATUS_BED_WIDTH && HOTENDS <= 4)
1733
+#define DO_DRAW_CUTTER (HAS_CUTTER && !DO_DRAW_BED)
1734
 #define DO_DRAW_CHAMBER (HAS_TEMP_CHAMBER && STATUS_CHAMBER_WIDTH && HOTENDS <= 4)
1734
 #define DO_DRAW_CHAMBER (HAS_TEMP_CHAMBER && STATUS_CHAMBER_WIDTH && HOTENDS <= 4)
1735
 #define DO_DRAW_FAN (HAS_FAN0 && STATUS_FAN_WIDTH && HOTENDS <= 4 && defined(STATUS_FAN_FRAMES))
1735
 #define DO_DRAW_FAN (HAS_FAN0 && STATUS_FAN_WIDTH && HOTENDS <= 4 && defined(STATUS_FAN_FRAMES))
1736
 
1736
 

Loading…
Cancel
Save