Browse Source

Move status screen defines

Scott Lahteine 5 years ago
parent
commit
6a514a1e8e
2 changed files with 15 additions and 14 deletions
  1. 14
    0
      Marlin/src/lcd/dogm/dogm_Statusscreen.h
  2. 1
    14
      Marlin/src/lcd/dogm/status_screen_DOGM.cpp

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

@@ -1726,3 +1726,17 @@
1726 1726
     #endif
1727 1727
   #endif
1728 1728
 #endif
1729
+
1730
+#define DO_DRAW_LOGO (STATUS_LOGO_WIDTH && ENABLED(CUSTOM_STATUS_SCREEN_IMAGE))
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)
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))
1736
+
1737
+#define ANIM_HOTEND (HOTENDS && ENABLED(STATUS_HOTEND_ANIM))
1738
+#define ANIM_BED (DO_DRAW_BED && ENABLED(STATUS_BED_ANIM))
1739
+#define ANIM_CHAMBER (DO_DRAW_CHAMBER && ENABLED(STATUS_CHAMBER_ANIM))
1740
+#define ANIM_CUTTER (DO_DRAW_CUTTER && ENABLED(STATUS_CUTTER_ANIM))
1741
+
1742
+#define ANIM_HBCC (ANIM_HOTEND || ANIM_BED || ANIM_CHAMBER || ANIM_CUTTER)

+ 1
- 14
Marlin/src/lcd/dogm/status_screen_DOGM.cpp View File

@@ -67,20 +67,6 @@
67 67
 #define EXTRAS_BASELINE (40 + INFO_FONT_ASCENT)
68 68
 #define STATUS_BASELINE (LCD_PIXEL_HEIGHT - INFO_FONT_DESCENT)
69 69
 
70
-#define DO_DRAW_LOGO (STATUS_LOGO_WIDTH && ENABLED(CUSTOM_STATUS_SCREEN_IMAGE))
71
-#define DO_DRAW_HOTENDS (HOTENDS > 0)
72
-#define DO_DRAW_CUTTER (HAS_CUTTER)
73
-#define DO_DRAW_BED (HAS_HEATED_BED && STATUS_BED_WIDTH && HOTENDS <= 4)
74
-#define DO_DRAW_CHAMBER (HAS_TEMP_CHAMBER && STATUS_CHAMBER_WIDTH && HOTENDS <= 4)
75
-#define DO_DRAW_FAN (HAS_FAN0 && STATUS_FAN_WIDTH && HOTENDS <= 4 && defined(STATUS_FAN_FRAMES))
76
-
77
-#define ANIM_HOTEND (HOTENDS && ENABLED(STATUS_HOTEND_ANIM))
78
-#define ANIM_BED (DO_DRAW_BED && ENABLED(STATUS_BED_ANIM))
79
-#define ANIM_CHAMBER (DO_DRAW_CHAMBER && ENABLED(STATUS_CHAMBER_ANIM))
80
-#define ANIM_CUTTER (DO_DRAW_CUTTER && ENABLED(STATUS_CUTTER_ANIM))
81
-
82
-#define ANIM_HBCC (ANIM_HOTEND || ANIM_BED || ANIM_CHAMBER || ANIM_CUTTER)
83
-
84 70
 #if ANIM_HBCC
85 71
   enum HeatBits : uint8_t {
86 72
     HEATBIT_HOTEND,
@@ -90,6 +76,7 @@
90 76
   };
91 77
   IF<(HEATBIT_CUTTER > 7), uint16_t, uint8_t>::type heat_bits;
92 78
 #endif
79
+
93 80
 #if ANIM_HOTEND
94 81
   #define HOTEND_ALT(N) TEST(heat_bits, HEATBIT_HOTEND + N)
95 82
 #else

Loading…
Cancel
Save