clean up _draw_heater_status

MarlinFirmware · Mar 15, 2023 · f07161e · f07161e
1 parent fa0b78a
commit f07161e
Showing 1 changed file with 25 additions and 41 deletions.
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
@@ -187,72 +187,56 @@ FORCE_INLINE void _draw_heater_status(const heater_id_t heater, const uint16_t x
     #endif
   #endif
 
-  #if HAS_HOTEND && HAS_HEATED_BED
-    celsius_float_t tc, tt;
-    bool c_draw, t_draw, i_draw, ta;
-    const bool isBed = heater < 0;
-    if (isBed) {
+  celsius_float_t tc = 0, tt = 0;
+  bool isBed = (DISABLED(HAS_HOTEND) && ENABLED(HAS_HEATED_BED)) || (BOTH(HAS_HOTEND, HAS_HEATED_BED) && heater < 0),
+       ta = false, c_draw, t_draw, i_draw;
+  c_draw = t_draw = i_draw = !ui.did_first_redraw;
+  if (isBed) {
+    #if HAS_HEATED_BED
       tc = thermalManager.degBed();
       tt = thermalManager.degTargetBed();
       ta = thermalManager.isHeatingBed();
-      c_draw = tc != old_bed_temp;
-      t_draw = tt != old_bed_target;
-      i_draw = ta != old_bed_on;
+      c_draw |= tc != old_bed_temp;
+      t_draw |= tt != old_bed_target;
+      i_draw |= ta != old_bed_on;
       old_bed_temp = tc;
       old_bed_target = tt;
       old_bed_on = ta;
-    }
-    else {
+      #if HAS_LEVELING
+        i_draw |= planner.leveling_active != old_leveling_on;
+        old_leveling_on = planner.leveling_active;
+      #endif
+    #endif
+  }
+  else {
+    #if HAS_HOTEND
       tc = thermalManager.degHotend(heater);
       tt = thermalManager.degTargetHotend(heater);
       ta = thermalManager.isHeatingHotend(heater);
-      c_draw = tc != old_temp[heater];
-      t_draw = tt != old_target[heater];
-      i_draw = ta != old_on[heater];
+      c_draw |= tc != old_temp[heater];
+      t_draw |= tt != old_target[heater];
+      i_draw |= ta != old_on[heater];
       old_temp[heater] = tc;
       old_target[heater] = tt;
       old_on[heater] = ta;
-    }
-  #elif HAS_HOTEND
-    constexpr bool isBed = false;
-    const celsius_float_t tc = thermalManager.degHotend(heater), tt = thermalManager.degTargetHotend(heater);
-    const bool ta = thermalManager.isHeatingHotend(heater);
-    bool c_draw = tc != old_temp[heater], t_draw = tt != old_target[heater], i_draw = ta != old_on[heater];
-    old_temp[heater] = tc; old_target[heater] = tt; old_on[heater] = ta;
-  #elif HAS_HEATED_BED
-    constexpr bool isBed = true;
-    const celsius_float_t tc = thermalManager.degBed(), tt = thermalManager.degTargetBed();
-    const bool ta = thermalManager.isHeatingBed();
-    bool c_draw = tc != old_bed_temp, t_draw = tt != old_bed_target, i_draw = ta != old_bed_on;
-    old_bed_temp = tc; old_bed_target = tt; old_bed_on = ta;
-  #else
-    bool c_draw = false, t_draw = false, i_draw = false;
-    constexpr celsius_float_t tc = 0, tt = 0;
-    constexpr bool ta = 0;
-  #endif
-
-  #if HAS_HEATED_BED && HAS_LEVELING
-    if (isBed) {
-      i_draw |= (planner.leveling_active != old_leveling_on);
-      old_leveling_on = planner.leveling_active;
-    }
-  #endif
+    #endif
+  }
 
   // Draw target temperature, if needed
-  if (!ui.did_first_redraw || t_draw) {
+  if (t_draw) {
     dwin_string.set(i16tostr3rj(tt + 0.5));
     dwin_string.add(LCD_STR_DEGREE);
     DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, x, y, S(dwin_string.string()));
   }
 
   // Draw heater icon with on / off / leveled states
-  if (!ui.did_first_redraw || i_draw) {
+  if (i_draw) {
     const uint8_t ico = isBed ? (TERN0(HAS_LEVELING, planner.leveling_active) ? ICON_BedLevelOff : ICON_BedOff) : ICON_HotendOff;
     DWIN_ICON_Show(ICON, ico + ta, x, y + STATUS_CHR_HEIGHT + 2);
   }
 
   // Draw current temperature, if needed
-  if (!ui.did_first_redraw || c_draw) {
+  if (c_draw) {
     dwin_string.set(i16tostr3rj(tc + 0.5));
     dwin_string.add(LCD_STR_DEGREE);
     DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, x, y + 70, S(dwin_string.string()));