瀏覽代碼

wizard for snmm fix

PavelSindler 7 年之前
父節點
當前提交
5601dd276d
共有 2 個文件被更改,包括 5 次插入2 次删除
  1. 2 2
      Firmware/Marlin_main.cpp
  2. 3 0
      Firmware/ultralcd.cpp

+ 2 - 2
Firmware/Marlin_main.cpp

@@ -1236,6 +1236,7 @@ void setup()
 #ifndef DEBUG_DISABLE_STARTMSGS
 	check_babystep(); //checking if Z babystep is in allowed range
 
+  for (int i = 0; i < 4; i++) EEPROM_read_B(EEPROM_BOWDEN_LENGTH + i * 2, &bowden_length[i]);
   if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 1) {
 	  lcd_wizard(0);
   }
@@ -1266,8 +1267,7 @@ void setup()
 	  if (!previous_settings_retrieved) {
 		  lcd_show_fullscreen_message_and_wait_P(MSG_DEFAULT_SETTINGS_LOADED);
 	  }
-  }
-  for (int i = 0; i < 4; i++) EEPROM_read_B(EEPROM_BOWDEN_LENGTH + i * 2, &bowden_length[i]);
+  }  
   
 #endif //DEBUG_DISABLE_STARTMSGS
   lcd_update_enable(true);

+ 3 - 0
Firmware/ultralcd.cpp

@@ -3332,8 +3332,10 @@ void lcd_wizard(int state) {
 			wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(MSG_WIZARD_FILAMENT_LOADED, false);
 			if (wizard_event) state = 8;
 			else state = 6;
+
 			break;
 		case 6: //waiting for preheat nozzle for PLA;
+#ifndef SNMM
 			lcd_display_message_fullscreen_P(MSG_WIZARD_WILL_PREHEAT);
 			current_position[Z_AXIS] = 100; //move in z axis to make space for loading filament
 			plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], homing_feedrate[Z_AXIS] / 60, active_extruder);
@@ -3351,6 +3353,7 @@ void lcd_wizard(int state) {
 				lcd_set_custom_characters();
 				delay_keep_alive(1000);
 			}
+#endif //not SNMM
 			state = 7;
 			break;
 		case 7: //load filament