Merge pull request #1088 from PavelSindler/M600_change_extruder

M600 change extruder

Firmware/Marlin_main.cpp

@@ -3121,16 +3121,18 @@ void gcode_M600(bool automatic, float x_position, float y_position, float z_shif
 
 		if (mmu_enabled)
 		{
-			if (saved_printing) mmu_eject_filament(mmu_extruder, false); //if M600 was invoked by filament senzor (FINDA) eject filament so user can easily remove it
-			if (!automatic) mmu_M600_wait_and_beep();
-			if (saved_printing) {
+			if (!automatic) {
+				if (saved_printing) mmu_eject_filament(mmu_extruder, false); //if M600 was invoked by filament senzor (FINDA) eject filament so user can easily remove it
+				mmu_M600_wait_and_beep();
+				if (saved_printing) {
 
-				lcd_clear();
-				lcd_set_cursor(0, 2);
-				lcd_puts_P(_T(MSG_PLEASE_WAIT));
+					lcd_clear();
+					lcd_set_cursor(0, 2);
+					lcd_puts_P(_T(MSG_PLEASE_WAIT));
 
-				mmu_command(MMU_CMD_R0);
-				manage_response(false, false);
+					mmu_command(MMU_CMD_R0);
+					manage_response(false, false);
+				}
 			}
 			mmu_M600_load_filament(automatic);
 		}

Firmware/mmu.cpp

@@ -814,11 +814,6 @@ void mmu_eject_fil_4()
 	mmu_eject_filament(4, true);
 }
 
-void mmu_eject_fil_5()
-{
-	mmu_eject_filament(5, true);
-}
-
 void load_all()
 {
 #ifndef SNMM
@@ -954,13 +949,37 @@ void mmu_eject_filament(uint8_t filament, bool recover)
 {
 	if (filament < 5) 
 	{
-		mmu_command(MMU_CMD_E0 + filament);
-		manage_response(false, false);
-		if (recover)
+
+		if (degHotend0() > EXTRUDE_MINTEMP)
 		{
-			lcd_show_fullscreen_message_and_wait_P(_i("Please remove filament and then press the knob."));
-			mmu_command(MMU_CMD_R0);
+			st_synchronize();
+			lcd_update_enable(false);
+			lcd_clear();
+			lcd_set_cursor(0, 1); lcd_puts_P(_i("Ejecting filament"));
+			current_position[E_AXIS] -= 80;
+			plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 2500 / 60, active_extruder);
+			st_synchronize();
+
+			lcd_update_enable(true);
+
+			mmu_command(MMU_CMD_E0 + filament);
 			manage_response(false, false);
+			if (recover)
+			{
+				lcd_show_fullscreen_message_and_wait_P(_i("Please remove filament and then press the knob."));
+				mmu_command(MMU_CMD_R0);
+				manage_response(false, false);
+			}
+		}
+		else
+		{
+			lcd_clear();
+			lcd_set_cursor(0, 0);
+			lcd_puts_P(_T(MSG_ERROR));
+			lcd_set_cursor(0, 2);
+			lcd_puts_P(_T(MSG_PREHEAT_NOZZLE));
+			delay(2000);
+			lcd_clear();
 		}
 	}
 	else