Browse Source

🐛 Fix ProUI / JyersUI leveling preheat (#24064)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
Mateusz Kleina 2 years ago
parent
commit
4a73fa18d8
No account linked to committer's email address

+ 7
- 1
Marlin/src/gcode/bedlevel/abl/G29.cpp View File

437
       remember_feedrate_scaling_off();
437
       remember_feedrate_scaling_off();
438
 
438
 
439
       #if ENABLED(PREHEAT_BEFORE_LEVELING)
439
       #if ENABLED(PREHEAT_BEFORE_LEVELING)
440
-        if (!abl.dryrun) probe.preheat_for_probing(LEVELING_NOZZLE_TEMP, LEVELING_BED_TEMP);
440
+        if (!abl.dryrun) probe.preheat_for_probing(LEVELING_NOZZLE_TEMP,
441
+          #if BOTH(DWIN_LCD_PROUI, HAS_HEATED_BED)
442
+            HMI_data.BedLevT
443
+          #else
444
+            LEVELING_BED_TEMP
445
+          #endif
446
+        );
441
       #endif
447
       #endif
442
     }
448
     }
443
 
449
 

+ 1
- 10
Marlin/src/lcd/e3v2/jyersui/dwin.cpp View File

2869
               #if ENABLED(AUTO_BED_LEVELING_UBL)
2869
               #if ENABLED(AUTO_BED_LEVELING_UBL)
2870
                 #if ENABLED(PREHEAT_BEFORE_LEVELING)
2870
                 #if ENABLED(PREHEAT_BEFORE_LEVELING)
2871
                   Popup_Handler(Heating);
2871
                   Popup_Handler(Heating);
2872
-                  #if HAS_HOTEND
2873
-                    if (thermalManager.degTargetHotend(0) < LEVELING_NOZZLE_TEMP)
2874
-                      thermalManager.setTargetHotend(LEVELING_NOZZLE_TEMP, 0);
2875
-                  #endif
2876
-                  #if HAS_HEATED_BED
2877
-                    if (thermalManager.degTargetBed() < LEVELING_BED_TEMP)
2878
-                      thermalManager.setTargetBed(LEVELING_BED_TEMP);
2879
-                  #endif
2880
-                  thermalManager.wait_for_hotend(0);
2881
-                  TERN_(HAS_HEATED_BED, thermalManager.wait_for_bed_heating());
2872
+                  probe.preheat_for_probing(LEVELING_NOZZLE_TEMP, LEVELING_BED_TEMP);
2882
                 #endif
2873
                 #endif
2883
                 #if HAS_BED_PROBE
2874
                 #if HAS_BED_PROBE
2884
                   Popup_Handler(Level);
2875
                   Popup_Handler(Level);

+ 1
- 1
Marlin/src/lcd/e3v2/proui/dwin.cpp View File

1702
     ApplyExtMinT();
1702
     ApplyExtMinT();
1703
   #endif
1703
   #endif
1704
   #if BOTH(HAS_HEATED_BED, PREHEAT_BEFORE_LEVELING)
1704
   #if BOTH(HAS_HEATED_BED, PREHEAT_BEFORE_LEVELING)
1705
-    HMI_data.BedLevT = PREHEAT_1_TEMP_BED;
1705
+    HMI_data.BedLevT = LEVELING_BED_TEMP;
1706
   #endif
1706
   #endif
1707
   TERN_(BAUD_RATE_GCODE, SetBaud250K());
1707
   TERN_(BAUD_RATE_GCODE, SetBaud250K());
1708
 }
1708
 }

+ 6
- 7
Marlin/src/lcd/e3v2/proui/dwin_defines.h View File

120
   #if ENABLED(PREVENT_COLD_EXTRUSION)
120
   #if ENABLED(PREVENT_COLD_EXTRUSION)
121
     int16_t ExtMinT = EXTRUDE_MINTEMP;
121
     int16_t ExtMinT = EXTRUDE_MINTEMP;
122
   #endif
122
   #endif
123
-  int16_t BedLevT = PREHEAT_1_TEMP_BED;
124
-  TERN_(BAUD_RATE_GCODE, bool Baud115K = false);
123
+  #if BOTH(HAS_HEATED_BED, PREHEAT_BEFORE_LEVELING)
124
+    int16_t BedLevT = LEVELING_BED_TEMP;
125
+  #endif
126
+  #if ENABLED(BAUD_RATE_GCODE)
127
+    bool Baud115K = false;
128
+  #endif
125
   bool FullManualTramming = false;
129
   bool FullManualTramming = false;
126
   // Led
130
   // Led
127
   #if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS)
131
   #if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS)
135
 
139
 
136
 static constexpr size_t eeprom_data_size = 64;
140
 static constexpr size_t eeprom_data_size = 64;
137
 extern HMI_data_t HMI_data;
141
 extern HMI_data_t HMI_data;
138
-
139
-#if PREHEAT_1_TEMP_BED
140
-  #undef LEVELING_BED_TEMP
141
-  #define LEVELING_BED_TEMP HMI_data.BedLevT
142
-#endif

Loading…
Cancel
Save