|
@@ -1598,9 +1598,9 @@ static void lcd_preheat_menu()
|
|
|
if (farm_mode)
|
|
|
MENU_ITEM(function, PSTR("farm - " STRINGIFY(FARM_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FARM_PREHEAT_HPB_TEMP)), lcd_preheat_farm);
|
|
|
|
|
|
- MENU_ITEM(function, PSTR("ABS - " STRINGIFY(ABS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ABS_PREHEAT_HPB_TEMP)), lcd_preheat_abs);
|
|
|
MENU_ITEM(function, PSTR("PLA - " STRINGIFY(PLA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PLA_PREHEAT_HPB_TEMP)), lcd_preheat_pla);
|
|
|
MENU_ITEM(function, PSTR("PET - " STRINGIFY(PET_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PET_PREHEAT_HPB_TEMP)), lcd_preheat_pet);
|
|
|
+ MENU_ITEM(function, PSTR("ABS - " STRINGIFY(ABS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ABS_PREHEAT_HPB_TEMP)), lcd_preheat_abs);
|
|
|
MENU_ITEM(function, PSTR("HIPS - " STRINGIFY(HIPS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(HIPS_PREHEAT_HPB_TEMP)), lcd_preheat_hips);
|
|
|
MENU_ITEM(function, PSTR("PP - " STRINGIFY(PP_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PP_PREHEAT_HPB_TEMP)), lcd_preheat_pp);
|
|
|
MENU_ITEM(function, PSTR("FLEX - " STRINGIFY(FLEX_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FLEX_PREHEAT_HPB_TEMP)), lcd_preheat_flex);
|
|
@@ -1668,24 +1668,14 @@ static void lcd_support_menu()
|
|
|
MENU_ITEM(submenu, PSTR("Belt status"), lcd_menu_belt_status);
|
|
|
|
|
|
MENU_ITEM(submenu, PSTR("Temperatures"), lcd_menu_temperatures);
|
|
|
- if (fans_check_enabled == true) {
|
|
|
- MENU_ITEM(function, PSTR("Check fans [EN]"), lcd_set_fan_check);
|
|
|
- }
|
|
|
- else {
|
|
|
- MENU_ITEM(function, PSTR("Check fans [DIS]"), lcd_set_fan_check);
|
|
|
- }
|
|
|
#endif //MK1BP
|
|
|
-
|
|
|
-#ifdef AUTOMATIC_RECOVERY_AFTER_CRASH
|
|
|
- MENU_ITEM(back, PSTR("Auto recover crash"), lcd_main_menu);
|
|
|
-#endif
|
|
|
END_MENU();
|
|
|
}
|
|
|
|
|
|
void lcd_set_fan_check() {
|
|
|
fans_check_enabled = !fans_check_enabled;
|
|
|
eeprom_update_byte((unsigned char *)EEPROM_FAN_CHECK_ENABLED, fans_check_enabled);
|
|
|
- lcd_goto_menu(lcd_support_menu, 15);
|
|
|
+ lcd_goto_menu(lcd_settings_menu, 8);
|
|
|
}
|
|
|
|
|
|
void lcd_unLoadFilament()
|
|
@@ -3248,7 +3238,8 @@ static void lcd_silent_mode_set() {
|
|
|
sei();
|
|
|
#endif //TMC2130
|
|
|
digipot_init();
|
|
|
- lcd_goto_menu(lcd_settings_menu, 7);
|
|
|
+ if (IS_SD_PRINTING || is_usb_printing) lcd_goto_menu(lcd_tune_menu, 8);
|
|
|
+ else lcd_goto_menu(lcd_settings_menu, 7);
|
|
|
}
|
|
|
|
|
|
static void lcd_crash_mode_set()
|
|
@@ -3259,7 +3250,8 @@ static void lcd_crash_mode_set()
|
|
|
}else{
|
|
|
crashdet_enable();
|
|
|
}
|
|
|
- lcd_goto_menu(lcd_settings_menu, 7);
|
|
|
+ if (IS_SD_PRINTING || is_usb_printing) lcd_goto_menu(lcd_tune_menu, 9);
|
|
|
+ else lcd_goto_menu(lcd_settings_menu, 9);
|
|
|
|
|
|
}
|
|
|
|
|
@@ -3281,7 +3273,8 @@ static void lcd_fsensor_state_set()
|
|
|
}else{
|
|
|
fsensor_enable();
|
|
|
}
|
|
|
- lcd_goto_menu(lcd_settings_menu, 7);
|
|
|
+ if (IS_SD_PRINTING || is_usb_printing) lcd_goto_menu(lcd_tune_menu, 7);
|
|
|
+ else lcd_goto_menu(lcd_settings_menu, 7);
|
|
|
|
|
|
}
|
|
|
|
|
@@ -3327,12 +3320,6 @@ void lcd_pinda_calibration_menu()
|
|
|
START_MENU();
|
|
|
MENU_ITEM(back, MSG_MENU_CALIBRATION, lcd_calibration_menu);
|
|
|
MENU_ITEM(submenu, MSG_CALIBRATE_PINDA, lcd_calibrate_pinda);
|
|
|
- if (temp_cal_active == false) {
|
|
|
- MENU_ITEM(function, MSG_TEMP_CALIBRATION_OFF, lcd_temp_calibration_set);
|
|
|
- }
|
|
|
- else {
|
|
|
- MENU_ITEM(function, MSG_TEMP_CALIBRATION_ON, lcd_temp_calibration_set);
|
|
|
- }
|
|
|
END_MENU();
|
|
|
}
|
|
|
|
|
@@ -3340,7 +3327,7 @@ void lcd_temp_calibration_set() {
|
|
|
temp_cal_active = !temp_cal_active;
|
|
|
eeprom_update_byte((unsigned char *)EEPROM_TEMP_CAL_ACTIVE, temp_cal_active);
|
|
|
digipot_init();
|
|
|
- lcd_goto_menu(lcd_pinda_calibration_menu, 2);
|
|
|
+ lcd_goto_menu(lcd_settings_menu, 10);
|
|
|
}
|
|
|
|
|
|
void lcd_calibrate_pinda() {
|
|
@@ -3680,12 +3667,13 @@ static void lcd_settings_menu()
|
|
|
} else {
|
|
|
MENU_ITEM(function, MSG_FSENSOR_ON, lcd_fsensor_state_set);
|
|
|
}
|
|
|
-
|
|
|
- if (SilentModeMenu == 0) {
|
|
|
- MENU_ITEM(function, MSG_SILENT_MODE_OFF, lcd_silent_mode_set);
|
|
|
- } else {
|
|
|
- MENU_ITEM(function, MSG_SILENT_MODE_ON, lcd_silent_mode_set);
|
|
|
+ if (fans_check_enabled == true) {
|
|
|
+ MENU_ITEM(function, MSG_FANS_CHECK_ON, lcd_set_fan_check);
|
|
|
}
|
|
|
+ else {
|
|
|
+ MENU_ITEM(function, MSG_FANS_CHECK_OFF, lcd_set_fan_check);
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
if (SilentModeMenu == 0) {
|
|
|
if (CrashDetectMenu == 0) {
|
|
@@ -3694,7 +3682,18 @@ static void lcd_settings_menu()
|
|
|
MENU_ITEM(function, MSG_CRASHDETECT_ON, lcd_crash_mode_set);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ if (temp_cal_active == false) {
|
|
|
+ MENU_ITEM(function, MSG_TEMP_CALIBRATION_OFF, lcd_temp_calibration_set);
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ MENU_ITEM(function, MSG_TEMP_CALIBRATION_ON, lcd_temp_calibration_set);
|
|
|
+ }
|
|
|
+ if (SilentModeMenu == 0) {
|
|
|
+ MENU_ITEM(function, MSG_SILENT_MODE_OFF, lcd_silent_mode_set);
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ MENU_ITEM(function, MSG_SILENT_MODE_ON, lcd_silent_mode_set);
|
|
|
+ }
|
|
|
if (!isPrintPaused && !homing_flag)
|
|
|
{
|
|
|
MENU_ITEM(submenu, MSG_BABYSTEP_Z, lcd_babystep_z);
|
|
@@ -3727,30 +3726,27 @@ static void lcd_calibration_menu()
|
|
|
MENU_ITEM(back, MSG_MAIN, lcd_main_menu);
|
|
|
if (!isPrintPaused)
|
|
|
{
|
|
|
+ MENU_ITEM(function, MSG_WIZARD, lcd_wizard);
|
|
|
+ MENU_ITEM(submenu, MSG_V2_CALIBRATION, lcd_v2_calibration);
|
|
|
MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28 W"));
|
|
|
- MENU_ITEM(function, MSG_SELFTEST, lcd_selftest_v);
|
|
|
+ MENU_ITEM(function, MSG_SELFTEST, lcd_selftest_v);
|
|
|
#ifdef MK1BP
|
|
|
// MK1
|
|
|
// "Calibrate Z"
|
|
|
MENU_ITEM(gcode, MSG_HOMEYZ, PSTR("G28 Z"));
|
|
|
#else //MK1BP
|
|
|
// MK2
|
|
|
-MENU_ITEM(function, MSG_CALIBRATE_BED, lcd_mesh_calibration);
|
|
|
+ MENU_ITEM(function, MSG_CALIBRATE_BED, lcd_mesh_calibration);
|
|
|
// "Calibrate Z" with storing the reference values to EEPROM.
|
|
|
MENU_ITEM(submenu, MSG_HOMEYZ, lcd_mesh_calibration_z);
|
|
|
- MENU_ITEM(submenu, MSG_V2_CALIBRATION, lcd_v2_calibration);
|
|
|
-
|
|
|
#ifndef SNMM
|
|
|
//MENU_ITEM(function, MSG_CALIBRATE_E, lcd_calibrate_extruder);
|
|
|
#endif
|
|
|
// "Mesh Bed Leveling"
|
|
|
MENU_ITEM(submenu, MSG_MESH_BED_LEVELING, lcd_mesh_bedleveling);
|
|
|
- MENU_ITEM(function, MSG_WIZARD, lcd_wizard);
|
|
|
+
|
|
|
#endif //MK1BP
|
|
|
MENU_ITEM(submenu, MSG_BED_CORRECTION_MENU, lcd_adjust_bed);
|
|
|
-#ifndef MK1BP
|
|
|
- MENU_ITEM(submenu, MSG_CALIBRATION_PINDA_MENU, lcd_pinda_calibration_menu);
|
|
|
-#endif //MK1BP
|
|
|
MENU_ITEM(submenu, MSG_PID_EXTRUDER, pid_extruder);
|
|
|
MENU_ITEM(submenu, MSG_SHOW_END_STOPS, menu_show_end_stops);
|
|
|
#ifndef MK1BP
|
|
@@ -3759,6 +3755,9 @@ MENU_ITEM(function, MSG_CALIBRATE_BED, lcd_mesh_calibration);
|
|
|
#ifndef SNMM
|
|
|
//MENU_ITEM(function, MSG_RESET_CALIBRATE_E, lcd_extr_cal_reset);
|
|
|
#endif
|
|
|
+#ifndef MK1BP
|
|
|
+ MENU_ITEM(submenu, MSG_CALIBRATION_PINDA_MENU, lcd_pinda_calibration_menu);
|
|
|
+#endif //MK1BP
|
|
|
}
|
|
|
|
|
|
END_MENU();
|