diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/DWIN_SET.7z b/Marlin/CRX_ABL_1.70_ScreenFiles/DWIN_SET.7z new file mode 100644 index 0000000000..2ad5f2506f Binary files /dev/null and b/Marlin/CRX_ABL_1.70_ScreenFiles/DWIN_SET.7z differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/DWIN_SET/13.bin b/Marlin/CRX_ABL_1.70_ScreenFiles/DWIN_SET/13.bin deleted file mode 100644 index 51697be2ca..0000000000 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/DWIN_SET/13.bin and /dev/null differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/DWIN_SET/13触控配置文件.bin b/Marlin/CRX_ABL_1.70_ScreenFiles/DWIN_SET/13触控配置文件.bin index 5379f8040e..c2dbb8ea52 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/DWIN_SET/13触控配置文件.bin and b/Marlin/CRX_ABL_1.70_ScreenFiles/DWIN_SET/13触控配置文件.bin differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/DWIN_SET/14.bin b/Marlin/CRX_ABL_1.70_ScreenFiles/DWIN_SET/14.bin deleted file mode 100644 index e9551f71f9..0000000000 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/DWIN_SET/14.bin and /dev/null differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/DWIN_SET/14变量配置文件.bin b/Marlin/CRX_ABL_1.70_ScreenFiles/DWIN_SET/14变量配置文件.bin index 3abb40dff2..eae5534f5d 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/DWIN_SET/14变量配置文件.bin and b/Marlin/CRX_ABL_1.70_ScreenFiles/DWIN_SET/14变量配置文件.bin differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/DWIN_SET/15_Homing_Failed.bmp b/Marlin/CRX_ABL_1.70_ScreenFiles/DWIN_SET/15_Homing_Failed.bmp index acf66308e3..1661f2ebf4 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/DWIN_SET/15_Homing_Failed.bmp and b/Marlin/CRX_ABL_1.70_ScreenFiles/DWIN_SET/15_Homing_Failed.bmp differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/DWprj.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/DWprj.tft index 8697e5a17c..258271f1e8 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/DWprj.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/DWprj.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/DisplayConfig.xls b/Marlin/CRX_ABL_1.70_ScreenFiles/DisplayConfig.xls index 8c36dc5fc8..397b4353a0 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/DisplayConfig.xls and b/Marlin/CRX_ABL_1.70_ScreenFiles/DisplayConfig.xls differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/00_starting.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/00_starting.bmp.tft index 3399cf349d..b5bbe99c38 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/00_starting.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/00_starting.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/01_Blank.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/01_Blank.bmp.tft index cce0b74958..7a9b6bcca4 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/01_Blank.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/01_Blank.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/05_C_PrintFile.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/05_C_PrintFile.bmp.tft index 488d543ce5..c812a3e1dc 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/05_C_PrintFile.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/05_C_PrintFile.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/06_C_PrintFile.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/06_C_PrintFile.bmp.tft index ad36127630..61bc179e41 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/06_C_PrintFile.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/06_C_PrintFile.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/07_C_ChooseFile.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/07_C_ChooseFile.bmp.tft index cd0e03f939..8137431a9c 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/07_C_ChooseFile.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/07_C_ChooseFile.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/08_C_ChooseFile.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/08_C_ChooseFile.bmp.tft index 1415a1f083..b7640244b1 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/08_C_ChooseFile.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/08_C_ChooseFile.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/09_C_Printstatus1.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/09_C_Printstatus1.bmp.tft index e72a5559a9..dd79f31196 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/09_C_Printstatus1.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/09_C_Printstatus1.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/11_C_Printstatus3.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/11_C_Printstatus3.bmp.tft index e0fd9d3a45..01ea8e05de 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/11_C_Printstatus3.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/11_C_Printstatus3.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/14_C_Ajustment.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/14_C_Ajustment.bmp.tft index a8b00e60cc..91d28d06c1 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/14_C_Ajustment.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/14_C_Ajustment.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/15_Homing_Failed.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/15_Homing_Failed.bmp.tft index c30327c004..032f5a6d2e 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/15_Homing_Failed.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/15_Homing_Failed.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/16_Probing_Failed.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/16_Probing_Failed.bmp.tft index c8fd8fc4f5..95d7ecd0ad 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/16_Probing_Failed.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/16_Probing_Failed.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/17_C_PLAorABS.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/17_C_PLAorABS.bmp.tft index fc59761edf..26d4c3aa5a 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/17_C_PLAorABS.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/17_C_PLAorABS.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/18_C_PLAorABS.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/18_C_PLAorABS.bmp.tft index cb80e2461a..518450f8b0 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/18_C_PLAorABS.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/18_C_PLAorABS.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/20_C_Shut_Cool.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/20_C_Shut_Cool.bmp.tft index 4480866f87..f6e8c9cd41 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/20_C_Shut_Cool.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/20_C_Shut_Cool.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/21_Thermal_Runaway.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/21_Thermal_Runaway.bmp.tft index e7db9ca1c3..0f7b79b02c 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/21_Thermal_Runaway.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/21_Thermal_Runaway.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/25_Heating_Failed.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/25_Heating_Failed.bmp.tft index 14ab9a1ed1..2711d93377 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/25_Heating_Failed.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/25_Heating_Failed.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/27_Thermistor_Error.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/27_Thermistor_Error.bmp.tft index 49245b794e..e414c4e83b 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/27_Thermistor_Error.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/27_Thermistor_Error.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/31_C_01mmMove.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/31_C_01mmMove.bmp.tft index f88c500867..4da6bc7b56 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/31_C_01mmMove.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/31_C_01mmMove.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/32_C_Autohome.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/32_C_Autohome.bmp.tft index fcdf791fd5..c1a3aa472c 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/32_C_Autohome.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/32_C_Autohome.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/35_C_Information.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/35_C_Information.bmp.tft index 355e8d2f34..2d2fc698eb 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/35_C_Information.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/35_C_Information.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/38_C_no_filement1.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/38_C_no_filement1.bmp.tft index 9fba0bdb14..02799752e9 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/38_C_no_filement1.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/38_C_no_filement1.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/40_C_Keyboard1.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/40_C_Keyboard1.bmp.tft index 1316f2ef28..512113f2f5 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/40_C_Keyboard1.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/40_C_Keyboard1.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/44_C_HeatStop.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/44_C_HeatStop.bmp.tft index 11e7216b7f..fc8c722359 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/44_C_HeatStop.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/44_C_HeatStop.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/45_E_main.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/45_E_main.bmp.tft index 67e6ca91d5..773a24a559 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/45_E_main.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/45_E_main.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/46_E_PrintFile.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/46_E_PrintFile.bmp.tft index e4ec0ed6e0..553f8d7e27 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/46_E_PrintFile.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/46_E_PrintFile.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/47_E_PrintFile.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/47_E_PrintFile.bmp.tft index cee421b39a..134cb6629c 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/47_E_PrintFile.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/47_E_PrintFile.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/48_E_PrintFile.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/48_E_PrintFile.bmp.tft index 40de3b8507..50c03ac978 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/48_E_PrintFile.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/48_E_PrintFile.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/49_E_PrintFile.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/49_E_PrintFile.bmp.tft index f17fe531bd..2a7667d086 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/49_E_PrintFile.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/49_E_PrintFile.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/50_E_PrintFile.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/50_E_PrintFile.bmp.tft index 5ec07e04bb..bfc9e57b97 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/50_E_PrintFile.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/50_E_PrintFile.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/51_E_Printstatus1.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/51_E_Printstatus1.bmp.tft index c7339d12a4..ec0fd2f159 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/51_E_Printstatus1.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/51_E_Printstatus1.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/52_E_Printstatus2.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/52_E_Printstatus2.bmp.tft index d12da4a855..cfaf8b7055 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/52_E_Printstatus2.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/52_E_Printstatus2.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/53_E_Printstatus3.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/53_E_Printstatus3.bmp.tft index 1e3d0191db..c80efd7d0b 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/53_E_Printstatus3.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/53_E_Printstatus3.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/54_E_Printstatus4.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/54_E_Printstatus4.bmp.tft index cb5c1b699e..d7822b5887 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/54_E_Printstatus4.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/54_E_Printstatus4.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/55_E_StopPause.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/55_E_StopPause.bmp.tft index 4c821902fd..e25bd62e57 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/55_E_StopPause.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/55_E_StopPause.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/56_E_Ajustment.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/56_E_Ajustment.bmp.tft index 76f92eeb8e..9d94379cd6 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/56_E_Ajustment.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/56_E_Ajustment.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/57_E_TempControl1.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/57_E_TempControl1.bmp.tft index 1cbf115c4b..5b9837daf2 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/57_E_TempControl1.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/57_E_TempControl1.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/58_E_TempControl2.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/58_E_TempControl2.bmp.tft index 7929005942..364b03a63e 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/58_E_TempControl2.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/58_E_TempControl2.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/59_E_PLAorABS.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/59_E_PLAorABS.bmp.tft index 430c1a5f0e..77ccd2d9d1 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/59_E_PLAorABS.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/59_E_PLAorABS.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/60_E_PLAorABS.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/60_E_PLAorABS.bmp.tft index c51db8c4fb..073137b4f4 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/60_E_PLAorABS.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/60_E_PLAorABS.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/61_E_NozzleHotbet.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/61_E_NozzleHotbet.bmp.tft index d4737c53b7..0566781782 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/61_E_NozzleHotbet.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/61_E_NozzleHotbet.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/62_E_Shut_Cool.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/62_E_Shut_Cool.bmp.tft index 7b8da43ffe..dd930b8f0e 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/62_E_Shut_Cool.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/62_E_Shut_Cool.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/63_E_Tool.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/63_E_Tool.bmp.tft index 78356d8b2d..739b36fa2f 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/63_E_Tool.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/63_E_Tool.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/64_E_BedLeveling.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/64_E_BedLeveling.bmp.tft index 3e5cdd1ec5..5b07abc7a5 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/64_E_BedLeveling.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/64_E_BedLeveling.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/65_E_ChangeFilement.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/65_E_ChangeFilement.bmp.tft index 994c362a76..6f033bb845 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/65_E_ChangeFilement.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/65_E_ChangeFilement.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/66_E_Warn.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/66_E_Warn.bmp.tft index de294b7066..d585464035 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/66_E_Warn.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/66_E_Warn.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/67_E_Warn.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/67_E_Warn.bmp.tft index a97156d47e..f49bc41206 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/67_E_Warn.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/67_E_Warn.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/68_E_ChngFlmHeating.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/68_E_ChngFlmHeating.bmp.tft index 4fda56ddd2..3033b00f40 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/68_E_ChngFlmHeating.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/68_E_ChngFlmHeating.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/69_E_ChngorNot.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/69_E_ChngorNot.bmp.tft index 5e11576910..691baadfdd 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/69_E_ChngorNot.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/69_E_ChngorNot.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/70_E_ChngorNot.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/70_E_ChngorNot.bmp.tft index be0283d22a..dc1e985c5b 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/70_E_ChngorNot.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/70_E_ChngorNot.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/72_E_1mmMove.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/72_E_1mmMove.bmp.tft index 4e6a071cbe..55ba2d15dc 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/72_E_1mmMove.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/72_E_1mmMove.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/73_E_01mmMove.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/73_E_01mmMove.bmp.tft index 074964ed4d..ccf5b193f4 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/73_E_01mmMove.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/73_E_01mmMove.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/74_E_Autohome.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/74_E_Autohome.bmp.tft index ec6012c768..6f6c9674e3 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/74_E_Autohome.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/74_E_Autohome.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/75_E_Information.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/75_E_Information.bmp.tft index 3770dde58f..4d6ff07b90 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/75_E_Information.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/75_E_Information.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/78_E_no_filement1.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/78_E_no_filement1.bmp.tft index 718e7e3781..7cabe958d0 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/78_E_no_filement1.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/78_E_no_filement1.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/79_E_no_filement2.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/79_E_no_filement2.bmp.tft index eb520570c8..8ba91c914f 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/79_E_no_filement2.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/79_E_no_filement2.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/81_E_Refuel1.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/81_E_Refuel1.bmp.tft index 171c8105b1..f3fb92e3b7 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/81_E_Refuel1.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/81_E_Refuel1.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/82_E_Refuel2.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/82_E_Refuel2.bmp.tft index 16ec55d93f..90271164b0 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/82_E_Refuel2.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/82_E_Refuel2.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/83_E_Refuel3.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/83_E_Refuel3.bmp.tft index ed6e19ecff..30563150ed 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/83_E_Refuel3.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/83_E_Refuel3.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/84_E_Auxleve.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/84_E_Auxleve.bmp.tft index 6ed1425d89..f3329e0f4f 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/84_E_Auxleve.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/84_E_Auxleve.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/85_E_Autoleve.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/85_E_Autoleve.bmp.tft index 402b4c0856..fc2c866bf8 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/85_E_Autoleve.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/85_E_Autoleve.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/86_C_Wait.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/86_C_Wait.bmp.tft index 14ab9a1ed1..1ea1ceb204 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/86_C_Wait.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/86_C_Wait.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/87_E_Wait.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/87_E_Wait.bmp.tft index 2143fee297..29490bc2f6 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/87_E_Wait.bmp.tft and b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/87_E_Wait.bmp.tft differ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TouchConfig.xls b/Marlin/CRX_ABL_1.70_ScreenFiles/TouchConfig.xls index dc298492a0..197b85d7a5 100644 Binary files a/Marlin/CRX_ABL_1.70_ScreenFiles/TouchConfig.xls and b/Marlin/CRX_ABL_1.70_ScreenFiles/TouchConfig.xls differ diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 390dae637b..705601a568 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -35,8 +35,8 @@ #define Force10SProDisplay #define TM3DTouchscreenUpdates // Enables TM3D Error screens and eeprom screen not found in Creality screen firmware //#define AddonFilSensor //Adds a filamnt runout sensor to the CR20 or Ender 4 -//#define lerdgeFilSensor //Using lerdge filament sensor, which is opposite polarity to stock -//#define DualFilSensors //Using dual filament sensors on XMax and YMAX +#define lerdgeFilSensor //Using lerdge filament sensor, which is opposite polarity to stock +#define DualFilSensors //Using dual filament sensors on XMax and YMAX /* Hotend Type @@ -105,8 +105,8 @@ Requires a sensor from above Melzi board users may only select ABL_BI for bilinear leveling */ -//#define ABL_BI -#define ABL_UBL +#define ABL_BI +//#define ABL_UBL //#define POWER_LOSS_RECOVERY //Large and does not fit with any other features on Melzi, or UBL on Atmega /* @@ -410,7 +410,7 @@ #if(ENABLED(MachineCR10Orig)) #define MOTHERBOARD BOARD_MELZI_CREALITY #else -#define MOTHERBOARD BOARD_RAMPS_14_EFB +#define MOTHERBOARD BOARD_RAMPS_CREALITY #endif #endif @@ -1636,7 +1636,7 @@ #define Z_MAX_POS 250 #elif (ENABLED(MachineCRX)) #define X_BED_SIZE 315 -#define Y_BED_SIZE 330 +#define Y_BED_SIZE 315 #define Z_MAX_POS 400 #elif (ENABLED(MachineCR10Std)) #define X_BED_SIZE 315 diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 91dd56db19..2fa0e61e94 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -925,7 +925,7 @@ // as SD_DETECT_PIN in your board's pins definitions. // This setting should be disabled unless you are using a push button, pulling the pin to ground. // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER). - #if DISABLED(MachineCR10SPro) + #if NONE(MachineCR10SPro, MachineCRX) #define SD_DETECT_INVERTED #endif #define SD_FINISHED_STEPPERRELEASE true // Disable steppers when SD Print is finished @@ -2394,16 +2394,16 @@ #endif #define USER_DESC_1 "Setup" #if (ENABLED(ABL_UBL)) - #define USER_GCODE_1 "M190S" CommBedTmp "\nG28\nG29P1\nM109S215\nG29S1\nG29S0\nG29F0.0\nG29A\nG28\nG1X150Y150F50\nG1Z0\nM500\nM400\nM77\nM117 Set Z Offset" + #define USER_GCODE_1 "M190S" CommBedTmp "\nG28\nG29P1\nM109S215\nG29S1\nG29S0\nG29F0.0\nG29A\nG28\nG1X150Y150F5000\nG1Z0\nM500\nM400\nM117 Set Z Offset" #elif ENABLED(ABL_BI) - #define USER_GCODE_1 "M190S" CommBedTmp "\n M117 Probing....\nM104S215\nG28\nG29\nM400\nM109S215\nG28\nM420S1\nG1X100Y100\nG1Z0\nM500\nM400\nM77\nM117 Set Z Offset" + #define USER_GCODE_1 "M190S" CommBedTmp "\n M117 Probing....\nM104S215\nG28\nG29\nM400\nM109S215\nG28\nM420S1\nG1X100Y100F5000\nG1Z0\nM500\nM400\nM117 Set Z Offset" #endif #define USER_DESC_2 "PID Tune" #define USER_GCODE_2 "M106 S128 \n M303 C8 S215 E1 U \n M500 \n M117 PID Tune Done" #define USER_DESC_3 "Prep for Z Adjust" - #define USER_GCODE_3 "M190S" CommBedTmp "\nM104S215\nG28\nG29L1\nG1 X100Y100\nG1Z0" + #define USER_GCODE_3 "M190S" CommBedTmp "\nM104S215\nG28\nG29L1\nG1 X100Y100F5000\nG1Z0" #define USER_DESC_4 "Store Settings" #define USER_GCODE_4 "M500\nM117 Settings Stored" diff --git a/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp b/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp index 494f0e5986..d619fe9ea3 100644 --- a/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp +++ b/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp @@ -8,6 +8,7 @@ namespace ExtUI { + uint8_t waitway_lock = 0; const float manual_feedrate_mm_m[] = MANUAL_FEEDRATE; uint8_t progress_bar_percent; int startprogress = 0; @@ -131,34 +132,38 @@ void onIdle() { if(waitway && !commandsInQueue()) + waitway_lock++; + if(waitway_lock > 100) { + waitway_lock = 0; waitway = 0; //clear waitway if nothing is going on + } - // After homing, reset back to motion screen - if (isAxisPositionKnown((axis_t)X) && isAxisPositionKnown((axis_t)Y) && isAxisPositionKnown((axis_t)Z)) - { switch (waitway) { case 1: - InforShowStatus = true; - SERIAL_ECHOLN("==waitway 1=="); - rtscheck.RTS_SndData(4 + CEIconGrap, IconPrintstatus); // 4 for Pause - rtscheck.RTS_SndData(ExchangePageBase + 54, ExchangepageAddr); - waitway = 0; + if(isPositionKnown()) { + InforShowStatus = true; + SERIAL_ECHOLN("==waitway 1=="); + rtscheck.RTS_SndData(4 + CEIconGrap, IconPrintstatus); // 4 for Pause + rtscheck.RTS_SndData(ExchangePageBase + 54, ExchangepageAddr); + waitway = 0; + } break; case 2: - waitway = 0; + if (isPositionKnown()) + waitway = 0; break; case 3: waitway = 0; SERIAL_ECHOLN("==waitway 3=="); - if(!isPrinting()) + if(isPositionKnown()) rtscheck.RTS_SndData(ExchangePageBase + 64, ExchangepageAddr); break; case 4: - if (AutohomeKey) + if (AutohomeKey && isPositionKnown()) { //Manual Move Home Done SERIAL_ECHOLN("==waitway 4=="); rtscheck.RTS_SndData(ExchangePageBase + 71 + AxisPagenum, ExchangepageAddr); @@ -167,11 +172,14 @@ void onIdle() } break; case 5: - InforShowStatus = true; - waitway = 0; - SERIAL_ECHOLN("==waitway 5=="); - rtscheck.RTS_SndData(ExchangePageBase + 78, ExchangepageAddr); //exchange to 78 page - break; + if(isPositionKnown()) { + InforShowStatus = true; + waitway = 0; + SERIAL_ECHOLN("==waitway 5=="); + rtscheck.RTS_SndData(ExchangePageBase + 78, ExchangepageAddr); //exchange to 78 page + } + break; + } #if ENABLED(POWER_LOSS_RECOVERY) @@ -183,7 +191,7 @@ void onIdle() print_job_timer.power_off_start(); } #endif - } + if (InforShowStatus) { @@ -1041,9 +1049,9 @@ void RTSSHOW::RTS_HandleData() RTS_SndData(10, FilenameIcon); //Motor Icon if (!isPositionKnown()) - injectCommands_P(PSTR("G28\nG1F100Z0.0")); + injectCommands_P(PSTR("G28\nG1F1000Z0.0")); else - injectCommands_P(PSTR("G1F100Z0.0")); + injectCommands_P(PSTR("G1F1000Z0.0")); waitway = 2; RTS_SndData(ExchangePageBase + 64, ExchangepageAddr); @@ -1102,28 +1110,28 @@ void RTSSHOW::RTS_HandleData() #if (ENABLED(MachineCRX) && DISABLED(Force10SProDisplay)) || ENABLED(ForceCRXDisplay) if (recdat.data[0] == 1) // Top Left { - injectCommands_P(PSTR("G1F100Z3\nG1X30Y30F5000\nG1F100 Z0")); + injectCommands_P(PSTR("G1F1000Z3\nG1X30Y30F5000\nG1F1000 Z0")); waitway = 2; } else if (recdat.data[0] == 2) // Top Right { - injectCommands_P(PSTR("G1F100Z3\nG1X270Y30F5000\nG1F100Z0")); + injectCommands_P(PSTR("G1F1000Z3\nG1X270Y30F5000\nG1F1000Z0")); waitway = 2; } else if (recdat.data[0] == 3) // Centre { - injectCommands_P((PSTR("G1 F100 Z3\nG1 X150 Y150 F5000\nG1 F100 Z0"))); + injectCommands_P((PSTR("G1 F1000 Z3\nG1 X150 Y150 F5000\nG1 F1000 Z0"))); waitway = 2; } else if (recdat.data[0] == 4) // Bottom Left { - injectCommands_P((PSTR("G1 F100 Z3\nG1 X30 Y270 F5000\nG1 F100 Z0"))); + injectCommands_P((PSTR("G1 F1000 Z3\nG1 X30 Y270 F5000\nG1 F1000 Z0"))); waitway = 2; } else if (recdat.data[0] == 5) // Bottom Right { waitway = 4; //only for prohibiting to receive massage - injectCommands_P((PSTR("G1 F100 Z3\nG1 X270 Y270 F5000\nG1 F200 Z0"))); + injectCommands_P((PSTR("G1 F1000 Z3\nG1 X270 Y270 F5000\nG1 F2000 Z0"))); waitway = 2; } break; @@ -1132,9 +1140,9 @@ void RTSSHOW::RTS_HandleData() { // Disallow Z homing if X or Y are unknown if (!isAxisPositionKnown((axis_t)X) || !isAxisPositionKnown((axis_t)Y)) - injectCommands_P(PSTR("G28\nG1 F150 Z0.0")); + injectCommands_P(PSTR("G28\nG1F1500Z0.0")); else - injectCommands_P(PSTR("G28 Z\nG1 F150 Z0.0")); + injectCommands_P(PSTR("G28Z\nG1F1500Z0.0")); RTS_SndData(getZOffset_mm() * 100, 0x1026); } @@ -1164,9 +1172,9 @@ void RTSSHOW::RTS_HandleData() { setLevelingActive(false); // FIX ME if (!isPositionKnown()) - injectCommands_P((PSTR("G28\nG1 F100 Z0.0"))); + injectCommands_P((PSTR("G28\nG1 F1000 Z0.0"))); else - injectCommands_P((PSTR("G1 F100 Z0.0"))); + injectCommands_P((PSTR("G1 F1000 Z0.0"))); waitway = 2; @@ -1181,27 +1189,27 @@ void RTSSHOW::RTS_HandleData() } else if (recdat.data[0] == 6) // Assitant Level , Centre 1 { - injectCommands_P(PSTR("G1 F100 Z3\nG1 X150 Y150 F5000\nG1 F100 Z0")); + injectCommands_P(PSTR("G1 F1000 Z3\nG1 X150 Y150 F5000\nG1 F1000 Z0")); waitway = 2; } else if (recdat.data[0] == 7) // Assitant Level , Front Left 2 { - injectCommands_P((PSTR("G1 F100 Z3\nG1 X30 Y30 F5000\nG1 F100 Z0"))); + injectCommands_P((PSTR("G1 F1000 Z3\nG1 X30 Y30 F5000\nG1 F1000 Z0"))); waitway = 2; } else if (recdat.data[0] == 8) // Assitant Level , Front Right 3 { - injectCommands_P((PSTR("G1 F100 Z3\nG1 X270 Y30 F5000\nG1 F100 Z0"))); + injectCommands_P((PSTR("G1 F1000 Z3\nG1 X270 Y30 F5000\nG1 F1000 Z0"))); waitway = 2; } else if (recdat.data[0] == 9) // Assitant Level , Back Right 4 { - injectCommands_P((PSTR("G1 F100 Z3\nG1 X270 Y270 F5000\nG1 F100 Z0"))); + injectCommands_P((PSTR("G1 F1000 Z3\nG1 X270 Y270 F5000\nG1 F1000 Z0"))); waitway = 2; } else if (recdat.data[0] == 10) // Assitant Level , Back Left 5 { - injectCommands_P((PSTR("G1 F100 Z3\nG1 X30 Y270 F5000\nG1 F100 Z0"))); + injectCommands_P((PSTR("G1 F1000 Z3\nG1 X30 Y270 F5000\nG1 F1000 Z0"))); waitway = 2; } else if (recdat.data[0] == 11) // Autolevel switch @@ -1248,7 +1256,7 @@ void RTSSHOW::RTS_HandleData() if (recdat.data[0] == 3) //autohome { waitway = 4; - injectCommands_P((PSTR("G28\nG1 F100 Z10"))); + injectCommands_P((PSTR("G28\nG1 F1000 Z10"))); InforShowStatus = AutohomeKey = true; AutoHomeIconNum = 0; RTS_SndData(ExchangePageBase + 74, ExchangepageAddr); @@ -1629,7 +1637,27 @@ void RTSSHOW::RTS_HandleData() recdat.head[1] = FHTWO; } -void onPrinterKilled(PGM_P const msg) {} +void onPrinterKilled(PGM_P msg) { + SERIAL_ECHOLN("***kill***"); + rtscheck.RTS_SndData(ExchangePageBase + 15, ExchangepageAddr); + delay_ms(3); + int j = 0; + char outmsg[40]; + for (j; j < 4; j++) + { + outmsg[j] = '*'; + } + while (const char c = pgm_read_byte(msg++)) { + outmsg[j] = c; + j++; + } + for (j; j < 40; j++) + { + outmsg[j] = '*'; + } + rtscheck.RTS_SndData(outmsg, MacVersion); + delay_ms(10); +} void onMediaInserted() { @@ -1787,6 +1815,9 @@ void onUserConfirmRequired(const char *const msg) } void onStatusChanged(const char *const msg) { + for (int j = 0; j < 40; j++) // Clear old message + rtscheck.RTS_SndData(' ', 0x20E8+j); + rtscheck.RTS_SndData(msg, 0x20E8); } void onFactoryReset() { diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp index 85d9362ef8..b201605ffc 100644 --- a/Marlin/src/module/motion.cpp +++ b/Marlin/src/module/motion.cpp @@ -1663,7 +1663,7 @@ void homeaxis(const AxisEnum axis) { ]; if (backoff_mm) { current_position[axis] -= ABS(backoff_mm) * axis_home_dir; - line_to_current_position(); + line_to_current_position(HOMING_FEEDRATE_Z); } #endif diff --git a/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h b/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h index 2e5471a5bb..17885f8b1f 100644 --- a/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h +++ b/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h @@ -35,6 +35,7 @@ #define MOSFET_D_PIN 7 #define FIL_RUNOUT_PIN 2 +#define SD_DETECT_PIN 49 //always define it here, even without an LCD as its onboard #include "pins_RAMPS.h"