|
@@ -44,24 +44,17 @@
|
44
|
44
|
//
|
45
|
45
|
|
46
|
46
|
void Temperature::lcd_preheat(const int16_t e, const int8_t indh, const int8_t indb) {
|
|
47
|
+ UNUSED(e); UNUSED(indh); UNUSED(indb);
|
47
|
48
|
#if HAS_HOTEND
|
48
|
49
|
if (indh >= 0 && ui.material_preset[indh].hotend_temp > 0)
|
49
|
50
|
setTargetHotend(_MIN(thermalManager.heater_maxtemp[e] - HOTEND_OVERSHOOT, ui.material_preset[indh].hotend_temp), e);
|
50
|
|
- #else
|
51
|
|
- UNUSED(e); UNUSED(indh);
|
52
|
51
|
#endif
|
53
|
52
|
#if HAS_HEATED_BED
|
54
|
53
|
if (indb >= 0 && ui.material_preset[indb].bed_temp > 0) setTargetBed(ui.material_preset[indb].bed_temp);
|
55
|
|
- #else
|
56
|
|
- UNUSED(indb);
|
57
|
54
|
#endif
|
58
|
55
|
#if HAS_FAN
|
59
|
|
- set_fan_speed((
|
60
|
|
- #if FAN_COUNT > 1
|
61
|
|
- active_extruder < FAN_COUNT ? active_extruder :
|
62
|
|
- #endif
|
63
|
|
- 0), ui.material_preset[indh].fan_speed
|
64
|
|
- );
|
|
56
|
+ if (indh >= 0)
|
|
57
|
+ set_fan_speed(active_extruder < (FAN_COUNT) ? active_extruder : 0, ui.material_preset[indh].fan_speed);
|
65
|
58
|
#endif
|
66
|
59
|
ui.return_to_status();
|
67
|
60
|
}
|
|
@@ -93,7 +86,9 @@ void Temperature::lcd_preheat(const int16_t e, const int8_t indh, const int8_t i
|
93
|
86
|
|
94
|
87
|
#endif
|
95
|
88
|
|
96
|
|
- void do_preheat_end_m() { _preheat_end(editable.int8, 0); }
|
|
89
|
+ void do_preheat_end_m() {
|
|
90
|
+ _preheat_end(editable.int8, 0);
|
|
91
|
+ }
|
97
|
92
|
|
98
|
93
|
#if HAS_MULTI_HOTEND || HAS_HEATED_BED
|
99
|
94
|
|