浏览代码

🐛 Fix STATUS_COMBINE_HEATERS compile (#22405)

ellensp 2 年前
父节点
当前提交
178f9a77a8
没有帐户链接到提交者的电子邮件
共有 1 个文件被更改,包括 23 次插入19 次删除
  1. 23
    19
      Marlin/src/lcd/dogm/status_screen_DOGM.cpp

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

@@ -264,29 +264,33 @@ FORCE_INLINE void _draw_centered_temp(const celsius_t temp, const uint8_t tx, co
264 264
       #define HOTEND_BITMAP(N,S) status_hotend_a_bmp
265 265
     #endif
266 266
 
267
-    if (PAGE_CONTAINS(STATUS_HEATERS_Y, STATUS_HEATERS_BOT)) {
267
+    #if DISABLED(STATUS_COMBINE_HEATERS)
268 268
 
269
-      #define BAR_TALL (STATUS_HEATERS_HEIGHT - 2)
269
+      if (PAGE_CONTAINS(STATUS_HEATERS_Y, STATUS_HEATERS_BOT)) {
270 270
 
271
-      const float prop = target - 20,
272
-                  perc = prop > 0 && temp >= 20 ? (temp - 20) / prop : 0;
273
-      uint8_t tall = uint8_t(perc * BAR_TALL + 0.5f);
274
-      NOMORE(tall, BAR_TALL);
271
+        #define BAR_TALL (STATUS_HEATERS_HEIGHT - 2)
275 272
 
276
-      // Draw hotend bitmap, either whole or split by the heating percent
277
-      const uint8_t hx = STATUS_HOTEND_X(heater_id),
278
-                    bw = STATUS_HOTEND_BYTEWIDTH(heater_id);
279
-      #if ENABLED(STATUS_HEAT_PERCENT)
280
-        if (isHeat && tall <= BAR_TALL) {
281
-          const uint8_t ph = STATUS_HEATERS_HEIGHT - 1 - tall;
282
-          u8g.drawBitmapP(hx, STATUS_HEATERS_Y, bw, ph, HOTEND_BITMAP(TERN(HAS_MMU, active_extruder, heater_id), false));
283
-          u8g.drawBitmapP(hx, STATUS_HEATERS_Y + ph, bw, tall + 1, HOTEND_BITMAP(TERN(HAS_MMU, active_extruder, heater_id), true) + ph * bw);
284
-        }
285
-        else
286
-      #endif
287
-          u8g.drawBitmapP(hx, STATUS_HEATERS_Y, bw, STATUS_HEATERS_HEIGHT, HOTEND_BITMAP(TERN(HAS_MMU, active_extruder, heater_id), isHeat));
273
+        const float prop = target - 20,
274
+                    perc = prop > 0 && temp >= 20 ? (temp - 20) / prop : 0;
275
+        uint8_t tall = uint8_t(perc * BAR_TALL + 0.5f);
276
+        NOMORE(tall, BAR_TALL);
288 277
 
289
-    } // PAGE_CONTAINS
278
+        // Draw hotend bitmap, either whole or split by the heating percent
279
+        const uint8_t hx = STATUS_HOTEND_X(heater_id),
280
+                      bw = STATUS_HOTEND_BYTEWIDTH(heater_id);
281
+        #if ENABLED(STATUS_HEAT_PERCENT)
282
+          if (isHeat && tall <= BAR_TALL) {
283
+            const uint8_t ph = STATUS_HEATERS_HEIGHT - 1 - tall;
284
+            u8g.drawBitmapP(hx, STATUS_HEATERS_Y, bw, ph, HOTEND_BITMAP(TERN(HAS_MMU, active_extruder, heater_id), false));
285
+            u8g.drawBitmapP(hx, STATUS_HEATERS_Y + ph, bw, tall + 1, HOTEND_BITMAP(TERN(HAS_MMU, active_extruder, heater_id), true) + ph * bw);
286
+          }
287
+          else
288
+        #endif
289
+            u8g.drawBitmapP(hx, STATUS_HEATERS_Y, bw, STATUS_HEATERS_HEIGHT, HOTEND_BITMAP(TERN(HAS_MMU, active_extruder, heater_id), isHeat));
290
+
291
+      } // PAGE_CONTAINS
292
+
293
+    #endif // !STATUS_COMBINE_HEATERS
290 294
 
291 295
     if (PAGE_UNDER(7)) {
292 296
       #if HEATER_IDLE_HANDLER

正在加载...
取消
保存