zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

🐛 Fix ProUI / JyersUI leveling preheat (#24060, #24064)

Browse source 
Co-Authored-By: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
Keith Bennett 2022-04-19 17:16:26 -07:00 committed by Scott Lahteine
parent 4c84769a81
commit 7fa2dcedda
4 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Marlin/src/gcode/bedlevel/abl/G29.cpp
View file

@ -433,7 +433,13 @@ G29_TYPE GcodeSuite::G29() {
remember_feedrate_scaling_off(); remember_feedrate_scaling_off();
#if ENABLED(PREHEAT_BEFORE_LEVELING) #if ENABLED(PREHEAT_BEFORE_LEVELING)
if (!abl.dryrun) probe.preheat_for_probing(LEVELING_NOZZLE_TEMP, LEVELING_BED_TEMP); if (!abl.dryrun) probe.preheat_for_probing(LEVELING_NOZZLE_TEMP,
#if BOTH(DWIN_LCD_PROUI, HAS_HEATED_BED)
HMI_data.BedLevT
#else
LEVELING_BED_TEMP
#endif
);
#endif #endif
} }

13
Marlin/src/lcd/e3v2/jyersui/dwin.cpp
View file

@ -2079,7 +2079,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
#endif // HAS_HEATED_BED #endif // HAS_HEATED_BED
#if HAS_PREHEAT #if HAS_PREHEAT
#define _PREHEAT_SUBMENU_CASE(N) case Preheat##N: preheat_submenu(N, item, TEMP_PREHEAT##N); break; #define _PREHEAT_SUBMENU_CASE(N) case Preheat##N: preheat_submenu((N) - 1, item, TEMP_PREHEAT##N); break;
REPEAT_1(PREHEAT_COUNT, _PREHEAT_SUBMENU_CASE) REPEAT_1(PREHEAT_COUNT, _PREHEAT_SUBMENU_CASE)
#endif #endif
@ -2869,16 +2869,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
#if ENABLED(AUTO_BED_LEVELING_UBL) #if ENABLED(AUTO_BED_LEVELING_UBL)
#if ENABLED(PREHEAT_BEFORE_LEVELING) #if ENABLED(PREHEAT_BEFORE_LEVELING)
Popup_Handler(Heating); Popup_Handler(Heating);
#if HAS_HOTEND probe.preheat_for_probing(LEVELING_NOZZLE_TEMP, LEVELING_BED_TEMP);
if (thermalManager.degTargetHotend(0) < LEVELING_NOZZLE_TEMP)
thermalManager.setTargetHotend(LEVELING_NOZZLE_TEMP, 0);
#endif
#if HAS_HEATED_BED
if (thermalManager.degTargetBed() < LEVELING_BED_TEMP)
thermalManager.setTargetBed(LEVELING_BED_TEMP);
#endif
thermalManager.wait_for_hotend(0);
TERN_(HAS_HEATED_BED, thermalManager.wait_for_bed_heating());
#endif #endif
#if HAS_BED_PROBE #if HAS_BED_PROBE
Popup_Handler(Level); Popup_Handler(Level);

2
Marlin/src/lcd/e3v2/proui/dwin.cpp
View file

@ -1702,7 +1702,7 @@ void DWIN_SetDataDefaults() {
ApplyExtMinT(); ApplyExtMinT();
#endif #endif
#if BOTH(HAS_HEATED_BED, PREHEAT_BEFORE_LEVELING) #if BOTH(HAS_HEATED_BED, PREHEAT_BEFORE_LEVELING)
HMI_data.BedLevT = PREHEAT_1_TEMP_BED; HMI_data.BedLevT = LEVELING_BED_TEMP;
#endif #endif
TERN_(BAUD_RATE_GCODE, SetBaud250K()); TERN_(BAUD_RATE_GCODE, SetBaud250K());
} }

13
Marlin/src/lcd/e3v2/proui/dwin_defines.h
View file

@ -120,8 +120,12 @@ typedef struct {
#if ENABLED(PREVENT_COLD_EXTRUSION) #if ENABLED(PREVENT_COLD_EXTRUSION)
int16_t ExtMinT = EXTRUDE_MINTEMP; int16_t ExtMinT = EXTRUDE_MINTEMP;
#endif #endif
int16_t BedLevT = PREHEAT_1_TEMP_BED; #if BOTH(HAS_HEATED_BED, PREHEAT_BEFORE_LEVELING)
TERN_(BAUD_RATE_GCODE, bool Baud115K = false); int16_t BedLevT = LEVELING_BED_TEMP;
#endif
#if ENABLED(BAUD_RATE_GCODE)
bool Baud115K = false;
#endif
bool FullManualTramming = false; bool FullManualTramming = false;
// Led // Led
#if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS) #if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS)
@ -135,8 +139,3 @@ typedef struct {
static constexpr size_t eeprom_data_size = 64; static constexpr size_t eeprom_data_size = 64;
extern HMI_data_t HMI_data; extern HMI_data_t HMI_data;
#if PREHEAT_1_TEMP_BED
#undef LEVELING_BED_TEMP
#define LEVELING_BED_TEMP HMI_data.BedLevT
#endif