mirror of
https://github.com/MarlinFirmware/Marlin.git
synced 2024-12-11 21:14:34 +00:00
🩹 Fix lcd_preheat compile
This commit is contained in:
parent
94a8b70ce3
commit
dee41990cc
@ -870,6 +870,10 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
|||||||
#error "SD_REPRINT_LAST_SELECTED_FILE currently requires a Marlin-native LCD menu."
|
#error "SD_REPRINT_LAST_SELECTED_FILE currently requires a Marlin-native LCD menu."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if ANY(HAS_MARLINUI_MENU, TOUCH_UI_FTDI_EVE, EXTENSIBLE_UI) && !defined(MANUAL_FEEDRATE)
|
||||||
|
#error "MANUAL_FEEDRATE is required for MarlinUI, ExtUI, or FTDI EVE Touch UI."
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Custom Boot and Status screens
|
* Custom Boot and Status screens
|
||||||
*/
|
*/
|
||||||
|
@ -606,9 +606,11 @@ void DGUSScreenHandler::HandleHeaterControl(DGUS_VP_Variable &var, void *val_ptr
|
|||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if HAS_HEATED_BED
|
||||||
case VP_BED_CONTROL:
|
case VP_BED_CONTROL:
|
||||||
preheat_temp = PREHEAT_1_TEMP_BED;
|
preheat_temp = PREHEAT_1_TEMP_BED;
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
*(int16_t*)var.memadr = *(int16_t*)var.memadr > 0 ? 0 : preheat_temp;
|
*(int16_t*)var.memadr = *(int16_t*)var.memadr > 0 ? 0 : preheat_temp;
|
||||||
|
@ -1046,7 +1046,7 @@ namespace ExtUI {
|
|||||||
void coolDown() { thermalManager.cooldown(); }
|
void coolDown() { thermalManager.cooldown(); }
|
||||||
|
|
||||||
bool awaitingUserConfirm() {
|
bool awaitingUserConfirm() {
|
||||||
return TERN0(HAS_RESUME_CONTINUE, wait_for_user) || getHostKeepaliveIsPaused();
|
return TERN0(HAS_RESUME_CONTINUE, wait_for_user) || TERN0(HOST_KEEPALIVE_FEATURE, getHostKeepaliveIsPaused());
|
||||||
}
|
}
|
||||||
void setUserConfirmed() { TERN_(HAS_RESUME_CONTINUE, wait_for_user = false); }
|
void setUserConfirmed() { TERN_(HAS_RESUME_CONTINUE, wait_for_user = false); }
|
||||||
|
|
||||||
|
@ -65,9 +65,11 @@ static void _change_filament_with_temp(const uint16_t celsius) {
|
|||||||
queue.inject(cmd);
|
queue.inject(cmd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if HAS_PREHEAT
|
||||||
static void _change_filament_with_preset() {
|
static void _change_filament_with_preset() {
|
||||||
_change_filament_with_temp(ui.material_preset[MenuItemBase::itemIndex].hotend_temp);
|
_change_filament_with_temp(ui.material_preset[MenuItemBase::itemIndex].hotend_temp);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static void _change_filament_with_custom() {
|
static void _change_filament_with_custom() {
|
||||||
_change_filament_with_temp(thermalManager.degTargetHotend(MenuItemBase::itemIndex));
|
_change_filament_with_temp(thermalManager.degTargetHotend(MenuItemBase::itemIndex));
|
||||||
|
@ -47,6 +47,8 @@
|
|||||||
// "Temperature" submenu items
|
// "Temperature" submenu items
|
||||||
//
|
//
|
||||||
|
|
||||||
|
#if HAS_PREHEAT
|
||||||
|
|
||||||
void Temperature::lcd_preheat(const uint8_t e, const int8_t indh, const int8_t indb) {
|
void Temperature::lcd_preheat(const uint8_t e, const int8_t indh, const int8_t indb) {
|
||||||
UNUSED(e); UNUSED(indh); UNUSED(indb);
|
UNUSED(e); UNUSED(indh); UNUSED(indb);
|
||||||
#if HAS_HOTEND
|
#if HAS_HOTEND
|
||||||
@ -69,8 +71,6 @@ void Temperature::lcd_preheat(const uint8_t e, const int8_t indh, const int8_t i
|
|||||||
ui.return_to_status();
|
ui.return_to_status();
|
||||||
}
|
}
|
||||||
|
|
||||||
#if HAS_PREHEAT
|
|
||||||
|
|
||||||
#if HAS_TEMP_HOTEND
|
#if HAS_TEMP_HOTEND
|
||||||
inline void _preheat_end(const uint8_t m, const uint8_t e) { thermalManager.lcd_preheat(e, m, -1); }
|
inline void _preheat_end(const uint8_t m, const uint8_t e) { thermalManager.lcd_preheat(e, m, -1); }
|
||||||
void do_preheat_end_m() { _preheat_end(editable.int8, 0); }
|
void do_preheat_end_m() { _preheat_end(editable.int8, 0); }
|
||||||
|
@ -1016,7 +1016,7 @@ class Temperature {
|
|||||||
static void set_heating_message(const uint8_t, const bool=false) {}
|
static void set_heating_message(const uint8_t, const bool=false) {}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if HAS_MARLINUI_MENU && HAS_TEMPERATURE
|
#if HAS_MARLINUI_MENU && HAS_TEMPERATURE && HAS_PREHEAT
|
||||||
static void lcd_preheat(const uint8_t e, const int8_t indh, const int8_t indb);
|
static void lcd_preheat(const uint8_t e, const int8_t indh, const int8_t indb);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user