Browse Source

shipping prep. reset sets wizard flag, shipping prep wizard improvements

PavelSindler 7 years ago
parent
commit
997c8de161
2 changed files with 4 additions and 0 deletions
  1. 2 0
      Firmware/Marlin_main.cpp
  2. 2 0
      Firmware/ultralcd.cpp

+ 2 - 0
Firmware/Marlin_main.cpp

@@ -727,6 +727,7 @@ void factory_reset(char level, bool quiet)
             lcd_force_language_selection();
             // Force the "Follow calibration flow" message at the next boot up.
             calibration_status_store(CALIBRATION_STATUS_Z_CALIBRATION);
+			eeprom_write_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1); //run wizard
             farm_no = 0;
 			farm_mode == false;
 			eeprom_update_byte((uint8_t*)EEPROM_FARM_MODE, farm_mode);
@@ -1998,6 +1999,7 @@ bool gcode_M45(bool onlyZ) {
 				if (calibration_status() == CALIBRATION_STATUS_Z_CALIBRATION)
 					// Shipped, the nozzle height has been set already. The user can start printing now.
 					calibration_status_store(CALIBRATION_STATUS_CALIBRATED);
+					final_result = true;
 				// babystep_apply();
 			}
 		}

+ 2 - 0
Firmware/ultralcd.cpp

@@ -3562,6 +3562,8 @@ void lcd_wizard(int state) {
 			break;
 		case 4: //z cal.
 			lcd_show_fullscreen_message_and_wait_P(MSG_WIZARD_Z_CAL);
+			wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(MSG_STEEL_SHEET_CHECK, false, false);
+			if (!wizard_event) lcd_show_fullscreen_message_and_wait_P(MSG_PLACE_STEEL_SHEET);
 			wizard_event = gcode_M45(true);
 			if (wizard_event) state = 11; //shipped, no need to set first layer, go to final message directly
 			else end = true;