Upload complete 2.0.5.3UI version

Marlin/Configuration.h

@@ -1149,7 +1149,7 @@
  * For other boards you may need to define FIL_RUNOUT_PIN, FIL_RUNOUT2_PIN, etc.
  * By default the firmware assumes HIGH=FILAMENT PRESENT.
  */
-//#define FILAMENT_RUNOUT_SENSOR
+#define FILAMENT_RUNOUT_SENSOR
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
   #define NUM_RUNOUT_SENSORS   1     // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each.
   #define FIL_RUNOUT_INVERTING false // Set to true to invert the logic of the sensor.
@@ -1503,7 +1503,7 @@
  *    P1  Raise the nozzle always to Z-park height.
  *    P2  Raise the nozzle by Z-park amount, limited to Z_MAX_POS.
  */
-//#define NOZZLE_PARK_FEATURE
+#define NOZZLE_PARK_FEATURE
 
 #if ENABLED(NOZZLE_PARK_FEATURE)
   // Specify a park position as { X, Y, Z_raise }

Marlin/Configuration_adv.h

@@ -1047,7 +1047,7 @@
 
   //#define MENU_ADDAUTOSTART               // Add a menu option to run auto#.g files
 
-  #define EVENT_GCODE_SD_STOP "G28XY"       // G-code to run on Stop Print (e.g., "G28XY" or "G27")
+  #define EVENT_GCODE_SD_STOP "G28XY\nM84"       // G-code to run on Stop Print (e.g., "G28XY" or "G27")
 
   #if ENABLED(PRINTER_EVENT_LEDS)
     #define PE_LEDS_COMPLETED_TIME  (30*60) // (seconds) Time to keep the LED "done" color before restoring normal illumination
@@ -1868,7 +1868,7 @@
  * Requires NOZZLE_PARK_FEATURE.
  * This feature is required for the default FILAMENT_RUNOUT_SCRIPT.
  */
-//#define ADVANCED_PAUSE_FEATURE
+#define ADVANCED_PAUSE_FEATURE
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
   #define PAUSE_PARK_RETRACT_FEEDRATE         60  // (mm/s) Initial retract feedrate.
   #define PAUSE_PARK_RETRACT_LENGTH            2  // (mm) Initial retract.
@@ -1906,7 +1906,7 @@
   #define FILAMENT_CHANGE_ALERT_BEEPS         10  // Number of alert beeps to play when a response is needed.
   #define PAUSE_PARK_NO_STEPPER_TIMEOUT           // Enable for XYZ steppers to stay powered on during filament change.
 
-  //#define PARK_HEAD_ON_PAUSE                    // Park the nozzle during pause and filament change.
+  #define PARK_HEAD_ON_PAUSE                    // Park the nozzle during pause and filament change.
   //#define HOME_BEFORE_FILAMENT_CHANGE           // Ensure homing has been completed prior to parking for filament change
 
   //#define FILAMENT_LOAD_UNLOAD_GCODES           // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu.

Marlin/src/MarlinCore.cpp

@@ -60,7 +60,7 @@
 #if ENABLED(TFT_LITTLE_VGL_UI)
 #include "lvgl.h"
 #include "lcd/extui/lib/mks_ui/inc/tft_lvgl_configuration.h"
-#include "lcd/extui/lib/mks_ui/inc/draw_ready_print.h"
+#include "lcd/extui/lib/mks_ui/inc/draw_ui.h"
 #if ENABLED(MKS_TEST)
 #include "lcd/extui/lib/mks_ui/inc/mks_hardware_test.h"
 #endif
@@ -760,7 +760,11 @@ void kill(PGM_P const lcd_error/*=nullptr*/, PGM_P const lcd_component/*=nullptr
   SERIAL_ERROR_MSG(STR_ERR_KILLED);
 
   #if HAS_DISPLAY
-    ui.kill_screen(lcd_error ?: GET_TEXT(MSG_KILLED), lcd_component ?: NUL_STR);
+  	#if ENABLED(TFT_LITTLE_VGL_UI)
+	lv_draw_error_message(lcd_error);
+	#else
+       ui.kill_screen(lcd_error ?: GET_TEXT(MSG_KILLED), lcd_component ?: NUL_STR);
+	#endif
   #else
     UNUSED(lcd_error);
     UNUSED(lcd_component);

Marlin/src/lcd/extui/lib/mks_ui/inc/draw_dialog.h

@@ -36,6 +36,18 @@ extern "C" {     /* Make sure we have C-declarations in C++ programs */
 
 #define WIFI_ENABLE_TIPS 20
 
+#define DIALOG_PAUSE_MESSAGE_PAUSING		21
+#define DIALOG_PAUSE_MESSAGE_CHANGING	22
+#define DIALOG_PAUSE_MESSAGE_UNLOAD		23
+#define DIALOG_PAUSE_MESSAGE_WAITING		24
+#define DIALOG_PAUSE_MESSAGE_INSERT		25
+#define DIALOG_PAUSE_MESSAGE_LOAD		26
+#define DIALOG_PAUSE_MESSAGE_PURGE		27
+#define DIALOG_PAUSE_MESSAGE_RESUME		28
+#define DIALOG_PAUSE_MESSAGE_HEAT		29
+#define DIALOG_PAUSE_MESSAGE_HEATING		30
+#define DIALOG_PAUSE_MESSAGE_OPTION		31
+
 #define BTN_OK_X		100
 #define BTN_OK_Y		180
 #define BTN_CANCEL_X	280

Marlin/src/lcd/extui/lib/mks_ui/inc/draw_error_message.h

@@ -0,0 +1,21 @@
+#ifndef _LV_DRAW_ERROR_MESSAGE_
+#define _LV_DRAW_ERROR_MESSAGE_
+
+
+
+
+#if defined(__cplusplus)
+extern "C" {     /* Make sure we have C-declarations in C++ programs */
+#endif
+
+extern void lv_draw_error_message(PGM_P const msg);
+extern void lv_clear_error_message();
+
+
+//extern void disp_temp_ready_print();
+#if defined(__cplusplus)
+}    /* Make sure we have C-declarations in C++ programs */
+#endif
+
+#endif
+

Marlin/src/lcd/extui/lib/mks_ui/inc/draw_manuaLevel.h

@@ -0,0 +1,20 @@
+#ifndef _LV_DRAW_MANUAL_LEVEL_
+#define _LV_DRAW_MANUAL_LEVEL_
+
+
+
+
+#if defined(__cplusplus)
+extern "C" {     /* Make sure we have C-declarations in C++ programs */
+#endif
+
+extern void lv_draw_manualLevel(void);
+extern void lv_clear_manualLevel();
+
+//extern void disp_temp_ready_print();
+#if defined(__cplusplus)
+}    /* Make sure we have C-declarations in C++ programs */
+#endif
+
+#endif
+

Marlin/src/lcd/extui/lib/mks_ui/inc/draw_pause_message.h

@@ -0,0 +1,19 @@
+#ifndef _LV_DRAW_ERROR_MESSAGE_
+#define _LV_DRAW_ERROR_MESSAGE_
+
+
+
+
+#if defined(__cplusplus)
+extern "C" {     /* Make sure we have C-declarations in C++ programs */
+#endif
+
+extern void lv_draw_pause_message(const PauseMessage msg);
+
+//extern void disp_temp_ready_print();
+#if defined(__cplusplus)
+}    /* Make sure we have C-declarations in C++ programs */
+#endif
+
+#endif
+

Marlin/src/lcd/extui/lib/mks_ui/inc/draw_ui.h

@@ -24,7 +24,8 @@ extern "C" {     /* Make sure we have C-declarations in C++ programs */
 #include "../inc/draw_fan.h"
 #include "../inc/draw_about.h"
 #include "../inc/draw_change_speed.h"
-
+#include "../inc/draw_manuaLevel.h"
+#include "../inc/draw_error_message.h"
 
 #define  TFT35
 
@@ -75,6 +76,7 @@ typedef struct
 	uint8_t language;
 	uint8_t leveling_mode;
 	uint8_t from_flash_pic;
+	uint8_t finish_power_off;
 	uint32_t curFilesize;
 
 }CFG_ITMES;
@@ -84,6 +86,7 @@ typedef struct
 	uint8_t curTempType:1,
 			curSprayerChoose:3,
 			stepHeat:4;
+	uint8_t leveling_first_time:1;
 	uint8_t extruStep;
 	uint8_t extruSpeed;
 	uint8_t stepPrintSpeed;
@@ -156,7 +159,8 @@ typedef enum
 	DOUBLE_Z_UI,
 	ENABLE_INVERT_UI,
 	NUMBER_KEY_UI,
-	BABY_STEP_UI
+	BABY_STEP_UI,
+	ERROR_MESSAGE_UI
 } DISP_STATE;
 
 typedef struct

Marlin/src/lcd/extui/lib/mks_ui/inc/tft_Language_en.h

@@ -681,4 +681,18 @@
 #define PRINTING_OPERATION_OTHER_LANGUGE		"Operation"
 #define PRINTING_PAUSE_OTHER_LANGUGE			"Pause"
 
+#define MESSEGE_PAUSING_EN			"Parking..."
+#define MESSEGE_CHANGING_EN			"Wait for filament change to start"
+#define MESSEGE_UNLOAD_EN			"Wait for filament unload"
+#define MESSEGE_WAITING_EN			"Press Button to resume print"
+#define MESSEGE_INSERT_EN			"Insert filament and press button to continue"
+#define MESSEGE_LOAD_EN			"Wait for filament load"
+#define MESSEGE_PURGE_EN			"Wait for filament purge"
+#define MESSEGE_RESUME_EN			"Wait for print to resume..."
+#define MESSEGE_HEAT_EN			"Press button to heat nozzle"
+#define MESSEGE_HEATING_EN			"Nozzle heating Please wait..."
+#define MESSEGE_OPTION_EN			"Purge more or continue print?"
+#define MESSEGE_PURGE_MORE_EN   "Purge"
+#define MESSEGE_CONTINUE_PRINT_EN   "Print"
+
 #endif

Marlin/src/lcd/extui/lib/mks_ui/inc/tft_Language_fr.h

@@ -238,4 +238,19 @@
 #define DIALOG_PRINT_TIME_FR              "Temps d'impression: "
 #define DIALOG_REPRINT_FR                 "Print again"
 #define DIALOG_WIFI_ENABLE_TIPS_FR "The wifi module is being configured,\nplease wait a moment....."
+
+
+#define MESSEGE_PAUSING_FR			"Parking..."
+#define MESSEGE_CHANGING_FR			"Attente filament pour démarrer"
+#define MESSEGE_UNLOAD_FR			"Attente retrait du filament"
+#define MESSEGE_WAITING_FR			"Presser bouton,pour reprendre"
+#define MESSEGE_INSERT_FR			"Insérer filament et app. bouton pour continuer..."
+#define MESSEGE_LOAD_FR			"Attente chargement filament"
+#define MESSEGE_PURGE_FR			"Attente Purge filament"
+#define MESSEGE_RESUME_FR			"Attente reprise impression"
+#define MESSEGE_HEAT_FR			"Presser le bouton pour chauffer..."
+#define MESSEGE_HEATING_FR			"Buse en chauffe Patienter SVP..."
+#define MESSEGE_OPTION_FR			"Purger davantage ou continuer l'impression?"
+#define MESSEGE_PURGE_MORE_FR   "Purge"
+#define MESSEGE_CONTINUE_PRINT_FR   "Impression"
 #endif

Marlin/src/lcd/extui/lib/mks_ui/inc/tft_Language_it.h

@@ -234,4 +234,18 @@
 #define DIALOG_PRINT_TIME_IT              "Tempo di stampa: "
 #define DIALOG_REPRINT_IT                 "Print again"
 #define DIALOG_WIFI_ENABLE_TIPS_IT "The wifi module is being configured,\nplease wait a moment....."
+
+#define MESSEGE_PAUSING_IT			"Parcheggiando..."
+#define MESSEGE_CHANGING_IT			"Attendere avvio del cambio di filamento"
+#define MESSEGE_UNLOAD_IT			"Attendere l'espulsione del filamento"
+#define MESSEGE_WAITING_IT			"Premi per riprendere la stampa"
+#define MESSEGE_INSERT_IT			"Inserisci il filamento e premi per continuare"
+#define MESSEGE_LOAD_IT			"Attendere il caricamento del filamento"
+#define MESSEGE_PURGE_IT			"Attendere lo spurgo del filamento"
+#define MESSEGE_RESUME_IT			"Attendere la ripresa della stampa..."
+#define MESSEGE_HEAT_IT			"Premi per riscaldare ugello"
+#define MESSEGE_HEATING_IT			"Riscaldam. ugello Attendere prego..."
+#define MESSEGE_OPTION_IT			"Eliminare di più o continuare a stampare?"
+#define MESSEGE_PURGE_MORE_IT   "Epurazione"
+#define MESSEGE_CONTINUE_PRINT_IT   "Stampa"
 #endif

Marlin/src/lcd/extui/lib/mks_ui/inc/tft_Language_ru.h

@@ -236,4 +236,18 @@
 #define DIALOG_REPRINT_RU                 "Print again"
 #define DIALOG_WIFI_ENABLE_TIPS_RU "The wifi module is being configured,\nplease wait a moment....."
 
+#define MESSEGE_PAUSING_RU			"Стоянка..."
+#define MESSEGE_CHANGING_RU			"Подождите, пока начнется смена филамента"
+#define MESSEGE_UNLOAD_RU			"Дождитесь выгрузки нити"
+#define MESSEGE_WAITING_RU			"Нажмите кнопку,чтобы возобновить печать"
+#define MESSEGE_INSERT_RU			"Вставьте нить и нажмите кнопку,чтобы продолжить"
+#define MESSEGE_LOAD_RU			"Дождитесь загрузки нити"
+#define MESSEGE_PURGE_RU			"Дождитесь чистки нити"
+#define MESSEGE_RESUME_RU			"Подождите,пока печать возобновится ..."
+#define MESSEGE_HEAT_RU			"Нажмите кнопку, чтобы нагреть форсунку"
+#define MESSEGE_HEATING_RU			"Подогрев форсунки Пожалуйста, подождите ..."
+#define MESSEGE_OPTION_RU			"Очистить больше или продолжить печать?"
+#define MESSEGE_PURGE_MORE_RU   "чистка"
+#define MESSEGE_CONTINUE_PRINT_RU   "Распечатать"
+
 #endif

Marlin/src/lcd/extui/lib/mks_ui/inc/tft_Language_s_cn.h

@@ -231,4 +231,18 @@
 #define PRINTING_OPERATION_GBK				"操作"
 #define PRINTING_PAUSE_GBK						"暂停"
 
+#define MESSEGE_PAUSING_CN			"暂停中..."
+#define MESSEGE_CHANGING_CN			"等待换料开始..."
+#define MESSEGE_UNLOAD_CN			"退料中,请稍等..."
+#define MESSEGE_WAITING_CN			"点击按钮恢复打印"
+#define MESSEGE_INSERT_CN			"装载耗材后,点击按钮开始打印"
+#define MESSEGE_LOAD_CN			"进料中,请稍等..."
+#define MESSEGE_PURGE_CN			"等待挤出..."
+#define MESSEGE_RESUME_CN			"等待恢复打印..."
+#define MESSEGE_HEAT_CN			"按下按钮,加热喷头"
+#define MESSEGE_HEATING_CN			"喷头加热中,请等待..."
+#define MESSEGE_OPTION_CN			"挤出更多还是继续打印?"
+#define MESSEGE_PURGE_MORE_CN   "挤出"
+#define MESSEGE_CONTINUE_PRINT_CN   "打印"
+
 #endif

Marlin/src/lcd/extui/lib/mks_ui/inc/tft_Language_sp.h

@@ -243,5 +243,18 @@
 #define PRINTING_AJUSTES_SP		"Ajustes"
 #define PRINTING_PAUSAR_SP			"Pausar"
 
+#define MESSEGE_PAUSING_SP			"Aparcando..."
+#define MESSEGE_CHANGING_SP			"Esperando para iniciar el cambio de filamento"
+#define MESSEGE_UNLOAD_SP			"Espere para liberar el filamento"
+#define MESSEGE_WAITING_SP			"Pulsar el botón para reanudar impresión"
+#define MESSEGE_INSERT_SP			"Inserte el filamento y pulse el botón para continuar..."
+#define MESSEGE_LOAD_SP			"Espere para purgar el filamento"
+#define MESSEGE_PURGE_SP			"Espere para purgar el filamento"
+#define MESSEGE_RESUME_SP			"Esperando impresora para reanudar..."
+#define MESSEGE_HEAT_SP			"Pulse el botón para calentar la boquilla"
+#define MESSEGE_HEATING_SP			"Calentando boquilla Espere por favor..."
+#define MESSEGE_OPTION_SP			"¿Purgar más o continuar con la impresión?"
+#define MESSEGE_PURGE_MORE_SP   "Purga"
+#define MESSEGE_CONTINUE_PRINT_SP   "Impresión"
 
 #endif

Marlin/src/lcd/extui/lib/mks_ui/inc/tft_Language_t_cn.h

@@ -230,4 +230,19 @@
 #define TEXT_VALUE_T_CN                  "%d℃/%d℃"
 #define EXTRUDE_TEXT_VALUE_T_T_CN								": %d℃"
 #define WIFI_RECONNECT_TEXT_T_CN         "重新連接"
+
+#define MESSEGE_PAUSING_T_CN			"暫停中..."
+#define MESSEGE_CHANGING_T_CN			"等待換料開始..."
+#define MESSEGE_UNLOAD_T_CN			"退料中,請稍等..."
+#define MESSEGE_WAITING_T_CN			"點擊按鈕恢復打印"
+#define MESSEGE_INSERT_T_CN			"裝載耗材後,點擊按鈕開始打印"
+#define MESSEGE_LOAD_T_CN			"進料中,請稍等..."
+#define MESSEGE_PURGE_T_CN			"等待擠出..."
+#define MESSEGE_RESUME_T_CN			"等待恢復打印..."
+#define MESSEGE_HEAT_T_CN			"按下按鈕,加熱噴頭"
+#define MESSEGE_HEATING_T_CN			"噴頭加熱中,請等待..."
+#define MESSEGE_OPTION_T_CN			"擠出更多還是繼續打印"
+#define MESSEGE_PURGE_MORE_T_CN   "擠出"
+#define MESSEGE_CONTINUE_PRINT_T_CN   "打印"
+
 #endif

Marlin/src/lcd/extui/lib/mks_ui/inc/tft_multi_language.h

@@ -471,6 +471,24 @@ typedef struct TemperatureSettings_menu_disp
 }TemperatureSettings_menu_def;
 extern TemperatureSettings_menu_def TemperatureSettings_menu;
 
+typedef struct pause_msg_disp
+{
+	const char *pausing;
+	const char *changing;
+	const char *unload;
+	const char *waiting;
+	const char *insert;
+	const char *load;
+	const char *purge;
+	const char *resume;
+	const char *heat;
+	const char *heating;
+	const char *option;
+	const char *purgeMore;
+	const char *continuePrint;
+}pause_msg_def;
+extern pause_msg_def pause_msg_menu;
+
 /*****************************************/
 //********************************************//
 //#if defined(TFT70)

Marlin/src/lcd/extui/lib/mks_ui/src/draw_about.cpp

@@ -11,7 +11,7 @@
 #include "../../../../../module/temperature.h"
 
 static lv_obj_t * scr;
-static lv_obj_t * firmWare,*board;
+static lv_obj_t * fw_type,*board,*fw_version;
 
 #define ID_A_RETURN		1
 
@@ -84,14 +84,28 @@ void lv_draw_about(void)
 		lv_obj_align(label_Back, buttonBack, LV_ALIGN_IN_BOTTOM_MID,0, BUTTON_TEXT_Y_OFFSET);
 	}
 
-	firmWare = lv_label_create(scr, NULL);
-	lv_obj_set_style(firmWare, &tft_style_lable_rel);
-	lv_label_set_text(firmWare, "Firmware: Robin_Nano35");
-	lv_obj_align(firmWare, NULL, LV_ALIGN_CENTER,0, -20);
+	fw_version = lv_label_create(scr, NULL);
+	lv_obj_set_style(fw_version, &tft_style_lable_rel);
+	lv_label_set_text(fw_version, "Version: V_2.0.5.3");
+	lv_obj_align(fw_version, NULL, LV_ALIGN_CENTER,0, -60);
+
+	fw_type = lv_label_create(scr, NULL);
+	lv_obj_set_style(fw_type, &tft_style_lable_rel);
+	#if (MOTHERBOARD == BOARD_MKS_ROBIN_PRO)
+	lv_label_set_text(fw_type, "Firmware: Robin_Pro35");
+	#elif (MOTHERBOARD == BOARD_MKS_ROBIN_NANO)
+	lv_label_set_text(fw_type, "Firmware: Robin_Nano35");
+	#endif
+	lv_obj_align(fw_type, NULL, LV_ALIGN_CENTER,0, -20);
 
 	board = lv_label_create(scr, NULL);
 	lv_obj_set_style(board, &tft_style_lable_rel);
+	#if (MOTHERBOARD == BOARD_MKS_ROBIN_PRO)
+	lv_label_set_text(board, "Board: MKS Robin pro");
+	#elif (MOTHERBOARD == BOARD_MKS_ROBIN_NANO)
 	lv_label_set_text(board, "Board: MKS Robin nano");
+	#endif
+
 	lv_obj_align(board, NULL, LV_ALIGN_CENTER,0, 20);
 }