Browse Source

Fix unified status bed temp display

Scott Lahteine 4 years ago
parent
commit
6fd7f4fe1b

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

785
     #endif
785
     #endif
786
 
786
 
787
   #endif
787
   #endif
788
-#else
788
+#endif
789
+
790
+#ifndef STATUS_BED_WIDTH
789
   #define STATUS_BED_WIDTH 0
791
   #define STATUS_BED_WIDTH 0
790
 #endif
792
 #endif
791
 
793
 
1729
 
1731
 
1730
 #define DO_DRAW_LOGO (STATUS_LOGO_WIDTH && ENABLED(CUSTOM_STATUS_SCREEN_IMAGE))
1732
 #define DO_DRAW_LOGO (STATUS_LOGO_WIDTH && ENABLED(CUSTOM_STATUS_SCREEN_IMAGE))
1731
 #define DO_DRAW_HOTENDS (HOTENDS > 0)
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
 #define DO_DRAW_CUTTER (HAS_CUTTER && !DO_DRAW_BED)
1735
 #define DO_DRAW_CUTTER (HAS_CUTTER && !DO_DRAW_BED)
1734
 #define DO_DRAW_CHAMBER (HAS_TEMP_CHAMBER && STATUS_CHAMBER_WIDTH && HOTENDS <= 4)
1736
 #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))
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 View File

188
             u8g.drawBitmapP(hx, STATUS_HEATERS_Y, bw, STATUS_HEATERS_HEIGHT, HOTEND_BITMAP(heater, isHeat));
188
             u8g.drawBitmapP(hx, STATUS_HEATERS_Y, bw, STATUS_HEATERS_HEIGHT, HOTEND_BITMAP(heater, isHeat));
189
       #endif
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
     } // PAGE_CONTAINS
191
     } // PAGE_CONTAINS
207
 
192
 
208
     if (PAGE_UNDER(7)) {
193
     if (PAGE_UNDER(7)) {
240
     const float temp = thermalManager.degBed(),
225
     const float temp = thermalManager.degBed(),
241
               target = thermalManager.degTargetBed();
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
       const bool isHeat = BED_ALT();
229
       const bool isHeat = BED_ALT();
245
     #endif
230
     #endif
246
 
231
 
247
-    #if DO_DRAW_BED && DISABLED(STATUS_BED_ANIM)
232
+    #if DISABLED(STATUS_BED_ANIM)
248
       #define STATIC_BED    true
233
       #define STATIC_BED    true
249
       #define BED_DOT       isHeat
234
       #define BED_DOT       isHeat
250
     #else
235
     #else
513
       u8g.drawBitmapP(STATUS_HEATERS_X, STATUS_HEATERS_Y, STATUS_HEATERS_BYTEWIDTH, STATUS_HEATERS_HEIGHT, status_heaters_bmp);
498
       u8g.drawBitmapP(STATUS_HEATERS_X, STATUS_HEATERS_Y, STATUS_HEATERS_BYTEWIDTH, STATUS_HEATERS_HEIGHT, status_heaters_bmp);
514
   #endif
499
   #endif
515
 
500
 
516
-  #if DO_DRAW_CUTTER
501
+  #if DO_DRAW_CUTTER && DISABLED(STATUS_COMBINE_HEATERS)
517
     #if ANIM_CUTTER
502
     #if ANIM_CUTTER
518
       #define CUTTER_BITMAP(S) ((S) ? status_cutter_on_bmp : status_cutter_bmp)
503
       #define CUTTER_BITMAP(S) ((S) ? status_cutter_on_bmp : status_cutter_bmp)
519
     #else
504
     #else
537
       u8g.drawBitmapP(STATUS_BED_X, bedy, STATUS_BED_BYTEWIDTH, bedh, BED_BITMAP(BED_ALT()));
522
       u8g.drawBitmapP(STATUS_BED_X, bedy, STATUS_BED_BYTEWIDTH, bedh, BED_BITMAP(BED_ALT()));
538
   #endif
523
   #endif
539
 
524
 
540
-  #if DO_DRAW_CHAMBER
525
+  #if DO_DRAW_CHAMBER && DISABLED(STATUS_COMBINE_HEATERS)
541
     #if ANIM_CHAMBER
526
     #if ANIM_CHAMBER
542
       #define CHAMBER_BITMAP(S) ((S) ? status_chamber_on_bmp : status_chamber_bmp)
527
       #define CHAMBER_BITMAP(S) ((S) ? status_chamber_on_bmp : status_chamber_bmp)
543
     #else
528
     #else

Loading…
Cancel
Save