bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🎨 Define HAS_PREHEAT conditional

Browse Source
This commit is contained in:
Scott Lahteine
2021-10-27 21:15:58 -05:00
committed by Scott Lahteine
parent 1fd4258423
commit 84f9490149
55 changed files with 183 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/lcd/menu/menu_configuration.cpp
View File

@@ -310,7 +310,7 @@ void menu_advanced_settings();
#endif
#if PREHEAT_COUNT && DISABLED(SLIM_LCD_MENUS)
#if HAS_PREHEAT && DISABLED(SLIM_LCD_MENUS)
void _menu_configuration_preheat_settings() {
#define _MINTEMP_ITEM(N) HEATER_##N##_MINTEMP,
@@ -547,7 +547,7 @@ void menu_configuration() {
#endif
// Preheat configurations
#if PREHEAT_COUNT && DISABLED(SLIM_LCD_MENUS)
#if HAS_PREHEAT && DISABLED(SLIM_LCD_MENUS)
LOOP_L_N(m, PREHEAT_COUNT)
SUBMENU_N_S(m, ui.get_preheat_label(m), MSG_PREHEAT_M_SETTINGS, _menu_configuration_preheat_settings);
#endif

2
Marlin/src/lcd/menu/menu_filament.cpp
View File

@@ -90,7 +90,7 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
START_MENU();
if (LCD_HEIGHT >= 4) STATIC_ITEM_P(change_filament_header(mode), SS_DEFAULT|SS_INVERT);
BACK_ITEM(MSG_BACK);
#if PREHEAT_COUNT
#if HAS_PREHEAT
LOOP_L_N(m, PREHEAT_COUNT)
ACTION_ITEM_N_S(m, ui.get_preheat_label(m), MSG_PREHEAT_M, _change_filament_with_preset);
#endif

6
Marlin/src/lcd/menu/menu_temperature.cpp
View File

@@ -69,7 +69,7 @@ void Temperature::lcd_preheat(const uint8_t e, const int8_t indh, const int8_t i
ui.return_to_status();
}
#if PREHEAT_COUNT
#if HAS_PREHEAT
#if HAS_TEMP_HOTEND
inline void _preheat_end(const uint8_t m, const uint8_t e) { thermalManager.lcd_preheat(e, m, -1); }
@@ -138,7 +138,7 @@ void Temperature::lcd_preheat(const uint8_t e, const int8_t indh, const int8_t i
#endif // HAS_MULTI_HOTEND || HAS_HEATED_BED
#endif // PREHEAT_COUNT
#endif // HAS_PREHEAT
#if HAS_TEMP_HOTEND || HAS_HEATED_BED
@@ -263,7 +263,7 @@ void menu_temperature() {
#endif // HAS_FAN
#if PREHEAT_COUNT
#if HAS_PREHEAT
//
// Preheat for all Materials
//

8
Marlin/src/lcd/menu/menu_ubl.cpp
View File

@@ -208,7 +208,7 @@ void _lcd_ubl_edit_mesh() {
void _lcd_ubl_validate_mesh() {
START_MENU();
BACK_ITEM(MSG_UBL_TOOLS);
#if PREHEAT_COUNT
#if HAS_PREHEAT
#if HAS_HEATED_BED
#define VALIDATE_MESH_GCODE_ITEM(M) \
GCODES_ITEM_N_S(M, ui.get_preheat_label(M), MSG_UBL_VALIDATE_MESH_M, PSTR("G28\nG26CPI" STRINGIFY(M)))
@@ -230,7 +230,7 @@ void _lcd_ubl_edit_mesh() {
#endif
#endif
#endif
#endif // PREHEAT_COUNT
#endif // HAS_PREHEAT
ACTION_ITEM(MSG_UBL_VALIDATE_CUSTOM_MESH, _lcd_ubl_validate_custom_mesh);
ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
END_MENU();
@@ -324,7 +324,7 @@ void _lcd_ubl_invalidate() {
void _lcd_ubl_build_mesh() {
START_MENU();
BACK_ITEM(MSG_UBL_TOOLS);
#if PREHEAT_COUNT
#if HAS_PREHEAT
#if HAS_HEATED_BED
#define PREHEAT_BED_GCODE(M) "M190I" STRINGIFY(M) "\n"
#else
@@ -352,7 +352,7 @@ void _lcd_ubl_build_mesh() {
#endif
#endif
#endif
#endif // PREHEAT_COUNT
#endif // HAS_PREHEAT
SUBMENU(MSG_UBL_BUILD_CUSTOM_MESH, _lcd_ubl_custom_mesh);
GCODES_ITEM(MSG_UBL_BUILD_COLD_MESH, PSTR("G29NP1"));