Quellcode durchsuchen

Followup to heating progress

Scott Lahteine vor 6 Jahren
Ursprung
Commit
61db0b65b6
1 geänderte Dateien mit 2 neuen und 3 gelöschten Zeilen
  1. 2
    3
      Marlin/src/lcd/dogm/status_screen_DOGM.cpp

+ 2
- 3
Marlin/src/lcd/dogm/status_screen_DOGM.cpp Datei anzeigen

@@ -94,8 +94,7 @@ FORCE_INLINE void _draw_heater_status(const int8_t heater, const bool blink) {
94 94
   #endif
95 95
 
96 96
   const bool isHeat = IFBED(BED_ALT(), HOTEND_ALT(heater));
97
-  const uint8_t ix = IFBED(STATUS_BED_X, STATUS_HOTEND_X(heater)),
98
-                tx = IFBED(STATUS_BED_TEXT_X, STATUS_HOTEND_TEXT_X(heater));
97
+  const uint8_t tx = IFBED(STATUS_BED_TEXT_X, STATUS_HOTEND_TEXT_X(heater));
99 98
   const float temp = IFBED(thermalManager.degBed(), thermalManager.degHotend(heater)),
100 99
               target = IFBED(thermalManager.degTargetBed(), thermalManager.degTargetHotend(heater));
101 100
 
@@ -166,7 +165,7 @@ FORCE_INLINE void _draw_heater_status(const int8_t heater, const bool blink) {
166 165
     #if ENABLED(STATUS_HEAT_PERCENT)
167 166
 
168 167
       if (IFBED(true, STATIC_HOTEND) && isHeat) {
169
-        const uint8_t bx = ix + IFBED(STATUS_BED_WIDTH, STATUS_HOTEND_WIDTH(heater)) + 1;
168
+        const uint8_t bx = IFBED(STATUS_BED_X + STATUS_BED_WIDTH, STATUS_HOTEND_X(heater) + STATUS_HOTEND_WIDTH(heater)) + 1;
170 169
         u8g.drawFrame(bx, STATUS_HEATERS_Y, 3, STATUS_HEATERS_HEIGHT);
171 170
         if (tall) {
172 171
           const uint8_t ph = STATUS_HEATERS_HEIGHT - 1 - tall;

Laden…
Abbrechen
Speichern