Browse Source

sorting files disabled in farm mode, start printer status needs reponse from monitoring

PavelSindler 7 years ago
parent
commit
f45f206faf
3 changed files with 9 additions and 8 deletions
  1. 1 0
      Firmware/Marlin.h
  2. 7 7
      Firmware/Marlin_main.cpp
  3. 1 1
      Firmware/ultralcd.cpp

+ 1 - 0
Firmware/Marlin.h

@@ -440,3 +440,4 @@ void gcode_M701();
 #define UVLO !(PINE & (1<<4))
 
 void extr_unload2();
+void proc_commands();

+ 7 - 7
Firmware/Marlin_main.cpp

@@ -3286,17 +3286,17 @@ void process_commands()
 				enquecommand_front_P((PSTR("G28 W0")));
 				break;
 			}
-			lcd_show_fullscreen_message_and_wait_P(MSG_TEMP_CAL_WARNING);
-			bool result = lcd_show_fullscreen_message_yes_no_and_wait_P(MSG_STEEL_SHEET_CHECK, false, false);
-			if (result)
-			{
+			lcd_show_fullscreen_message_and_wait_P(MSG_TEMP_CAL_WARNING);
+			bool result = lcd_show_fullscreen_message_yes_no_and_wait_P(MSG_STEEL_SHEET_CHECK, false, false);
+			if (result)
+			{
 				current_position[Z_AXIS] = 50;
 				current_position[Y_AXIS] = 190;
 				plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder);
 				st_synchronize();
-				lcd_show_fullscreen_message_and_wait_P(MSG_REMOVE_STEEL_SHEET);
-			}
-			lcd_update_enable(true);
+				lcd_show_fullscreen_message_and_wait_P(MSG_REMOVE_STEEL_SHEET);
+			}
+			lcd_update_enable(true);
 			KEEPALIVE_STATE(NOT_BUSY); //no need to print busy messages as we print current temperatures periodicaly
 			SERIAL_ECHOLNPGM("PINDA probe calibration start");
 

+ 1 - 1
Firmware/ultralcd.cpp

@@ -7202,7 +7202,7 @@ static void lcd_connect_printer() {
 		i++;
 		t++;		
 		delay_keep_alive(100);
-		process_commands();
+		process_command_small();
 		if (t == 10) {
 			prusa_statistics(important_status, saved_filament_type);
 			t = 0;