Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix macro expansion error when using ProUI #24064

Merged
merged 3 commits into from
Apr 22, 2022
Merged

Fix macro expansion error when using ProUI #24064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6269166
Fix macro expansion error when using ProUI
mkleina Apr 21, 2022
16098c4
ProUI special case
thinkyhead Apr 22, 2022
68a6550
Also simplify JyersUI
thinkyhead Apr 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Marlin/src/gcode/bedlevel/abl/G29.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,13 @@ G29_TYPE GcodeSuite::G29() {
remember_feedrate_scaling_off();

#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
}

Expand Down
11 changes: 1 addition & 10 deletions Marlin/src/lcd/e3v2/jyersui/dwin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(PREHEAT_BEFORE_LEVELING)
Popup_Handler(Heating);
#if HAS_HOTEND
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());
probe.preheat_for_probing(LEVELING_NOZZLE_TEMP, LEVELING_BED_TEMP);
#endif
#if HAS_BED_PROBE
Popup_Handler(Level);
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/e3v2/proui/dwin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1702,7 +1702,7 @@ void DWIN_SetDataDefaults() {
ApplyExtMinT();
#endif
#if BOTH(HAS_HEATED_BED, PREHEAT_BEFORE_LEVELING)
HMI_data.BedLevT = PREHEAT_1_TEMP_BED;
HMI_data.BedLevT = LEVELING_BED_TEMP;
#endif
TERN_(BAUD_RATE_GCODE, SetBaud250K());
}
Expand Down
13 changes: 6 additions & 7 deletions Marlin/src/lcd/e3v2/proui/dwin_defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,12 @@ typedef struct {
#if ENABLED(PREVENT_COLD_EXTRUSION)
int16_t ExtMinT = EXTRUDE_MINTEMP;
#endif
int16_t BedLevT = PREHEAT_1_TEMP_BED;
TERN_(BAUD_RATE_GCODE, bool Baud115K = false);
#if BOTH(HAS_HEATED_BED, PREHEAT_BEFORE_LEVELING)
int16_t BedLevT = LEVELING_BED_TEMP;
#endif
#if ENABLED(BAUD_RATE_GCODE)
bool Baud115K = false;
#endif
bool FullManualTramming = false;
// Led
#if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS)
Expand All @@ -135,8 +139,3 @@ typedef struct {

static constexpr size_t eeprom_data_size = 64;
extern HMI_data_t HMI_data;

#if PREHEAT_1_TEMP_BED
#undef LEVELING_BED_TEMP
#define LEVELING_BED_TEMP HMI_data.BedLevT
#endif