Merge remote-tracking branch 'upstream/MK3' into MK3

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Firmware/Marlin_main.cpp

@@ -5583,7 +5583,19 @@ case 404:  //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp
 
 #else
 			//		plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], FILAMENTCHANGE_RFEED, active_extruder);
-			plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], 3500 / 60, active_extruder);
+			//plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], 3500 / 60, active_extruder);
+            
+            target[E_AXIS] -= FILAMENTCHANGE_FINALRETRACT;
+            target[E_AXIS] -= 50;
+            plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], 5200 / 60, active_extruder);
+            st_synchronize();
+            target[E_AXIS] -= 10;
+            plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], 80 / 60, active_extruder);
+            st_synchronize();
+            target[E_AXIS] -= 20;
+            plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], 5000 / 60, active_extruder);
+            st_synchronize();
+            
 #endif // SNMM
 
 
@@ -5974,8 +5986,14 @@ case 404:  //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp
 
 //		extr_unload2();
 
-		current_position[E_AXIS] -= 80;
-		plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 7000 / 60, active_extruder);
+		current_position[E_AXIS] -= 50;
+		plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 5200 / 60, active_extruder);
+        st_synchronize();
+        current_position[E_AXIS] -= 10;
+        plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 80 / 60, active_extruder);
+        st_synchronize();
+        current_position[E_AXIS] -= 20;
+        plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 5000 / 60, active_extruder);
 		st_synchronize();
 		lcd_setstatuspgm(WELCOME_MSG);
 		custom_message = false;

Firmware/language_all.cpp

@@ -601,8 +601,8 @@ const char * const MSG_FILAMENTCHANGE_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_FILAMENTCHANGE_CZ
 };
 
-const char MSG_FILAMENT_CLEAN_EN[] PROGMEM = "Is color clear?";
-const char MSG_FILAMENT_CLEAN_CZ[] PROGMEM = "Je barva cista?";
+const char MSG_FILAMENT_CLEAN_EN[] PROGMEM = "Filament extruding & with right color?";
+const char MSG_FILAMENT_CLEAN_CZ[] PROGMEM = "Filament vytlacen a spravne barvy?";
 const char * const MSG_FILAMENT_CLEAN_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_FILAMENT_CLEAN_EN,
 	MSG_FILAMENT_CLEAN_CZ
@@ -1149,7 +1149,7 @@ const char * const MSG_NO_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_NO_CZ
 };
 
-const char MSG_NOT_COLOR_EN[] PROGMEM = "Color not clear";
+const char MSG_NOT_COLOR_EN[] PROGMEM = "Color not right";
 const char MSG_NOT_COLOR_CZ[] PROGMEM = "Barva neni cista";
 const char * const MSG_NOT_COLOR_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_NOT_COLOR_EN,
@@ -1551,12 +1551,12 @@ const char * const MSG_SD_WRITE_TO_FILE_LANG_TABLE[1] PROGMEM = {
 	MSG_SD_WRITE_TO_FILE_EN
 };
 
-const char MSG_SECOND_SERIAL_OFF_EN[] PROGMEM = "2nd USART   [off]";
+const char MSG_SECOND_SERIAL_OFF_EN[] PROGMEM = "rPi port    [off]";
 const char * const MSG_SECOND_SERIAL_OFF_LANG_TABLE[1] PROGMEM = {
 	MSG_SECOND_SERIAL_OFF_EN
 };
 
-const char MSG_SECOND_SERIAL_ON_EN[] PROGMEM = "2nd USART    [on]";
+const char MSG_SECOND_SERIAL_ON_EN[] PROGMEM = "rPi port     [on]";
 const char * const MSG_SECOND_SERIAL_ON_LANG_TABLE[1] PROGMEM = {
 	MSG_SECOND_SERIAL_ON_EN
 };

Firmware/language_cz.h

@@ -278,7 +278,7 @@
 #define MSG_MARK_FIL									"Oznacte filament 100 mm od tela extruderu a po te potvrdte tlacitkem."
 #define MSG_CLEAN_NOZZLE_E								"E kalibrace ukoncena. Prosim ocistete trysku. Po te potvrdte tlacitkem."
 #define MSG_WAITING_TEMP								"Cekani na zchladnuti trysky a podlozky."
-#define MSG_FILAMENT_CLEAN								"Je barva cista?" 
+#define MSG_FILAMENT_CLEAN								"Filament vytlacen a spravne barvy?" 
 #define MSG_UNLOADING_FILAMENT							"Vysouvam filament"
 
 #define MSG_PAPER										"Umistete list papiru na podlozku a udrzujte jej pod tryskou behem mereni prvnich 4 bodu. Pokud tryska zachyti papir, vypnete tiskarnu."
@@ -365,4 +365,4 @@
 #define MSG_FILE_CNT						"Nektere soubory nebudou setrideny. Maximalni pocet souboru pro setrideni je 100."
 #define MSG_SORT_TIME						"Trideni [Cas]"
 #define MSG_SORT_ALPHA						"Trideni [Abeceda]"
-#define MSG_SORT_NONE						"Trideni [Zadne]"
+#define MSG_SORT_NONE						"Trideni [Zadne]"

Firmware/language_en.h

@@ -92,7 +92,7 @@
 #define MSG_YES					"Yes"
 #define MSG_NO					"No"
 #define(length=19) MSG_NOT_LOADED 			"Filament not loaded"
-#define MSG_NOT_COLOR 			"Color not clear"
+#define MSG_NOT_COLOR 			"Color not right"
 #define(length=20) MSG_LOADING_FILAMENT		"Loading filament"
 #define(length=20) MSG_PLEASE_WAIT			"Please wait"
 #define MSG_LOADING_COLOR		"Loading color"
@@ -269,7 +269,7 @@
 #define(length=20, lines=8) MSG_MARK_FIL						"Mark filament 100mm from extruder body. Click when done."
 #define(length=20, lines=8) MSG_CLEAN_NOZZLE_E				"E calibration finished. Please clean the nozzle. Click when done."
 #define(length=20, lines=3) MSG_WAITING_TEMP				"Waiting for nozzle and bed cooling"
-#define(length=20, lines=2) MSG_FILAMENT_CLEAN				"Is color clear?"
+#define(length=20, lines=2) MSG_FILAMENT_CLEAN				"Filament extruding & with right color?"
 #define(lenght=18, lines=1) MSG_UNLOADING_FILAMENT			"Unloading filament"
 #define(length=20, lines=8) MSG_PAPER						"Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."
 
@@ -388,5 +388,5 @@
 #define(length=17, lines=1) MSG_SORT_NONE						"Sort: [None]"
 #define(length=20, lines=1) MSG_SORTING							"Sorting files"
 #define(length=20, lines=4) MSG_FILE_CNT						"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
-#define(length=17, lines=1) MSG_SECOND_SERIAL_ON				"2nd USART    [on]"
-#define(length=17, lines=1) MSG_SECOND_SERIAL_OFF				"2nd USART   [off]"
+#define(length=17, lines=1) MSG_SECOND_SERIAL_ON				"rPi port     [on]"
+#define(length=17, lines=1) MSG_SECOND_SERIAL_OFF				"rPi port    [off]"