From 9ef5570fa33cce7dda0b84ab92e7a37ca64ad731 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 12 Dec 2017 13:41:31 +0100 Subject: [PATCH] menus accessable during first layer calibration updated --- Firmware/ultralcd.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a0e6529a..6aebacbc 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -915,7 +915,6 @@ void lcd_commands() } if (lcd_commands_step == 9 && !blocks_queued() && cmd_buffer_empty()) { - IS_SD_PRINTING = true; enquecommand_P(PSTR("M107")); enquecommand_P(PSTR("M104 S210")); enquecommand_P(PSTR("M140 S55")); @@ -1125,7 +1124,6 @@ void lcd_commands() if (lcd_commands_step == 1 && !blocks_queued() && cmd_buffer_empty()) { lcd_setstatuspgm(WELCOME_MSG); - IS_SD_PRINTING = false; lcd_commands_step = 0; lcd_commands_type = 0; if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 1) { @@ -1681,7 +1679,7 @@ static void lcd_support_menu() } #ifndef MK1BP MENU_ITEM(back, PSTR("------------"), lcd_main_menu); - if (!IS_SD_PRINTING && !is_usb_printing) MENU_ITEM(function, MSG_XYZ_DETAILS, lcd_service_mode_show_result); + if (!IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LCD_COMMAND_V2_CAL)) MENU_ITEM(function, MSG_XYZ_DETAILS, lcd_service_mode_show_result); MENU_ITEM(submenu, MSG_INFO_EXTRUDER, lcd_menu_extruder_info); MENU_ITEM(submenu, PSTR("Belt status"), lcd_menu_belt_status); @@ -3272,7 +3270,7 @@ static void lcd_silent_mode_set() { sei(); #endif //TMC2130 digipot_init(); - if (IS_SD_PRINTING || is_usb_printing) lcd_goto_menu(lcd_tune_menu, 8); + if (IS_SD_PRINTING || is_usb_printing || (lcd_commands_type == LCD_COMMAND_V2_CAL)) lcd_goto_menu(lcd_tune_menu, 8); else lcd_goto_menu(lcd_settings_menu, 7); } @@ -3284,7 +3282,7 @@ static void lcd_crash_mode_set() }else{ crashdet_enable(); } - if (IS_SD_PRINTING || is_usb_printing) lcd_goto_menu(lcd_tune_menu, 9); + if (IS_SD_PRINTING || is_usb_printing || (lcd_commands_type == LCD_COMMAND_V2_CAL)) lcd_goto_menu(lcd_tune_menu, 9); else lcd_goto_menu(lcd_settings_menu, 9); } @@ -3307,7 +3305,7 @@ static void lcd_fsensor_state_set() }else{ fsensor_enable(); } - if (IS_SD_PRINTING || is_usb_printing) lcd_goto_menu(lcd_tune_menu, 7); + if (IS_SD_PRINTING || is_usb_printing || (lcd_commands_type == LCD_COMMAND_V2_CAL)) lcd_goto_menu(lcd_tune_menu, 7); else lcd_goto_menu(lcd_settings_menu, 7); } @@ -4911,13 +4909,13 @@ static void lcd_main_menu() }*/ - if ( ( IS_SD_PRINTING || is_usb_printing ) && (current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU) && !homing_flag && !mesh_bed_leveling_flag) + if ( ( IS_SD_PRINTING || is_usb_printing || (lcd_commands_type == LCD_COMMAND_V2_CAL)) && (current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU) && !homing_flag && !mesh_bed_leveling_flag) { MENU_ITEM(submenu, MSG_BABYSTEP_Z, lcd_babystep_z);//8 } - if ( moves_planned() || IS_SD_PRINTING || is_usb_printing ) + if ( moves_planned() || IS_SD_PRINTING || is_usb_printing || (lcd_commands_type == LCD_COMMAND_V2_CAL)) { MENU_ITEM(submenu, MSG_TUNE, lcd_tune_menu); } else @@ -4944,7 +4942,7 @@ static void lcd_main_menu() } else { - if (!is_usb_printing) + if (!is_usb_printing && (lcd_commands_type != LCD_COMMAND_V2_CAL)) { //if (farm_mode) MENU_ITEM(submenu, MSG_FARM_CARD_MENU, lcd_farm_sdcard_menu); /*else*/ MENU_ITEM(submenu, MSG_CARD_MENU, lcd_sdcard_menu); @@ -4963,7 +4961,7 @@ static void lcd_main_menu() #endif - if (IS_SD_PRINTING || is_usb_printing) + if (IS_SD_PRINTING || is_usb_printing || (lcd_commands_type == LCD_COMMAND_V2_CAL)) { if (farm_mode) { @@ -4985,7 +4983,7 @@ static void lcd_main_menu() if(!isPrintPaused) MENU_ITEM(submenu, MSG_MENU_CALIBRATION, lcd_calibration_menu); } - if (!is_usb_printing) + if (!is_usb_printing && (lcd_commands_type != LCD_COMMAND_V2_CAL)) { MENU_ITEM(submenu, MSG_STATISTICS, lcd_menu_statistics); }