瀏覽代碼

Fix unified status bed temp display

Scott Lahteine 4 年之前
父節點
當前提交
6fd7f4fe1b
共有 2 個文件被更改,包括 8 次插入21 次删除
  1. 4
    2
      Marlin/src/lcd/dogm/dogm_Statusscreen.h
  2. 4
    19
      Marlin/src/lcd/dogm/status_screen_DOGM.cpp

+ 4
- 2
Marlin/src/lcd/dogm/dogm_Statusscreen.h 查看文件

@@ -785,7 +785,9 @@
785 785
     #endif
786 786
 
787 787
   #endif
788
-#else
788
+#endif
789
+
790
+#ifndef STATUS_BED_WIDTH
789 791
   #define STATUS_BED_WIDTH 0
790 792
 #endif
791 793
 
@@ -1729,7 +1731,7 @@
1729 1731
 
1730 1732
 #define DO_DRAW_LOGO (STATUS_LOGO_WIDTH && ENABLED(CUSTOM_STATUS_SCREEN_IMAGE))
1731 1733
 #define DO_DRAW_HOTENDS (HOTENDS > 0)
1732
-#define DO_DRAW_BED (HAS_HEATED_BED && STATUS_BED_WIDTH && HOTENDS <= 4)
1734
+#define DO_DRAW_BED (HAS_HEATED_BED && HOTENDS <= 4)
1733 1735
 #define DO_DRAW_CUTTER (HAS_CUTTER && !DO_DRAW_BED)
1734 1736
 #define DO_DRAW_CHAMBER (HAS_TEMP_CHAMBER && STATUS_CHAMBER_WIDTH && HOTENDS <= 4)
1735 1737
 #define DO_DRAW_FAN (HAS_FAN0 && STATUS_FAN_WIDTH && HOTENDS <= 4 && defined(STATUS_FAN_FRAMES))

+ 4
- 19
Marlin/src/lcd/dogm/status_screen_DOGM.cpp 查看文件

@@ -188,21 +188,6 @@ FORCE_INLINE void _draw_centered_temp(const int16_t temp, const uint8_t tx, cons
188 188
             u8g.drawBitmapP(hx, STATUS_HEATERS_Y, bw, STATUS_HEATERS_HEIGHT, HOTEND_BITMAP(heater, isHeat));
189 189
       #endif
190 190
 
191
-      // Draw a heating progress bar, if specified
192
-      #if DO_DRAW_BED && ENABLED(STATUS_HEAT_PERCENT)
193
-
194
-        if (STATIC_HOTEND && isHeat) {
195
-          const uint8_t bx = STATUS_HOTEND_X(heater) + STATUS_HOTEND_WIDTH(heater) + 1;
196
-          u8g.drawFrame(bx, STATUS_HEATERS_Y, 3, STATUS_HEATERS_HEIGHT);
197
-          if (tall) {
198
-            const uint8_t ph = STATUS_HEATERS_HEIGHT - 1 - tall;
199
-            if (PAGE_OVER(STATUS_HEATERS_Y + ph))
200
-              u8g.drawVLine(bx + 1, STATUS_HEATERS_Y + ph, tall);
201
-          }
202
-        }
203
-
204
-      #endif
205
-
206 191
     } // PAGE_CONTAINS
207 192
 
208 193
     if (PAGE_UNDER(7)) {
@@ -240,11 +225,11 @@ FORCE_INLINE void _draw_centered_temp(const int16_t temp, const uint8_t tx, cons
240 225
     const float temp = thermalManager.degBed(),
241 226
               target = thermalManager.degTargetBed();
242 227
 
243
-    #if ENABLED(STATUS_HEAT_PERCENT) || (DO_DRAW_BED && DISABLED(STATUS_BED_ANIM))
228
+    #if ENABLED(STATUS_HEAT_PERCENT) || DISABLED(STATUS_BED_ANIM)
244 229
       const bool isHeat = BED_ALT();
245 230
     #endif
246 231
 
247
-    #if DO_DRAW_BED && DISABLED(STATUS_BED_ANIM)
232
+    #if DISABLED(STATUS_BED_ANIM)
248 233
       #define STATIC_BED    true
249 234
       #define BED_DOT       isHeat
250 235
     #else
@@ -513,7 +498,7 @@ void MarlinUI::draw_status_screen() {
513 498
       u8g.drawBitmapP(STATUS_HEATERS_X, STATUS_HEATERS_Y, STATUS_HEATERS_BYTEWIDTH, STATUS_HEATERS_HEIGHT, status_heaters_bmp);
514 499
   #endif
515 500
 
516
-  #if DO_DRAW_CUTTER
501
+  #if DO_DRAW_CUTTER && DISABLED(STATUS_COMBINE_HEATERS)
517 502
     #if ANIM_CUTTER
518 503
       #define CUTTER_BITMAP(S) ((S) ? status_cutter_on_bmp : status_cutter_bmp)
519 504
     #else
@@ -537,7 +522,7 @@ void MarlinUI::draw_status_screen() {
537 522
       u8g.drawBitmapP(STATUS_BED_X, bedy, STATUS_BED_BYTEWIDTH, bedh, BED_BITMAP(BED_ALT()));
538 523
   #endif
539 524
 
540
-  #if DO_DRAW_CHAMBER
525
+  #if DO_DRAW_CHAMBER && DISABLED(STATUS_COMBINE_HEATERS)
541 526
     #if ANIM_CHAMBER
542 527
       #define CHAMBER_BITMAP(S) ((S) ? status_chamber_on_bmp : status_chamber_bmp)
543 528
     #else

Loading…
取消
儲存