diff --git a/CR6E3Touch_NextGen_TM3D.7z b/CR6E3Touch_NextGen_TM3D.7z index cc0088d4b3..069875ac99 100644 Binary files a/CR6E3Touch_NextGen_TM3D.7z and b/CR6E3Touch_NextGen_TM3D.7z differ diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index f08b5bcc0a..3fafde988d 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -2594,19 +2594,19 @@ #define Y_MAX_POS 404 #define Z_MAX_POS 405 #define ClipClearance 5 - #elif ANY(MachineEnder3, MachineEnder3V2, MachineEnder3S1) + #elif ANY(MachineEnder3, MachineEnder3V2) #define X_BED_SIZE 230 #define Y_BED_SIZE 230 #define Z_MAX_POS 250 #define X_MAX_POS 245 - #define Y_MAX_POS 250 + #define Y_MAX_POS 240 #define ClipClearance 15 #elif ANY(MachineEnder3S1) #define X_BED_SIZE 220 #define Y_BED_SIZE 220 #define Z_MAX_POS 270 - #define X_MAX_POS 225 - #define Y_MAX_POS 225 + #define X_MAX_POS 250 + #define Y_MAX_POS 228 #define ClipClearance 15 #elif(ANY(MachineEnder4, MachineEnder5)) #define X_BED_SIZE 220 @@ -3001,7 +3001,7 @@ * Enable the G26 Mesh Validation Pattern tool. */ #if NONE(MachineCR10Orig, SKRMiniE3V2) - //#define G26_MESH_VALIDATION // Enable G26 mesh validation + #define G26_MESH_VALIDATION // Enable G26 mesh validation #endif #if ENABLED(G26_MESH_VALIDATION) #define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle. diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index 99291c1758..8188bdd198 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -459,9 +459,9 @@ #endif -#if ANY(HAS_GRAPHICAL_TFT, LCD_USE_DMA_FSMC, HAS_FSMC_GRAPHICAL_TFT, HAS_SPI_GRAPHICAL_TFT, IS_DWIN_MARLINUI, EXTENSIBLE_UI) || !PIN_EXISTS(SD_DETECT) +//#if ANY(HAS_GRAPHICAL_TFT, LCD_USE_DMA_FSMC, HAS_FSMC_GRAPHICAL_TFT, HAS_SPI_GRAPHICAL_TFT, IS_DWIN_MARLINUI, EXTENSIBLE_UI) || !PIN_EXISTS(SD_DETECT) #define NO_LCD_REINIT 1 // Suppress LCD re-initialization -#endif +//#endif /** * Power Supply diff --git a/Marlin/src/lcd/extui/dgus_creality/creality_touch/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus_creality/creality_touch/DGUSDisplayDef.cpp index 7c47327377..d92f69bcd1 100644 --- a/Marlin/src/lcd/extui/dgus_creality/creality_touch/DGUSDisplayDef.cpp +++ b/Marlin/src/lcd/extui/dgus_creality/creality_touch/DGUSDisplayDef.cpp @@ -483,6 +483,8 @@ const struct VPMapping VPMap[] PROGMEM = { #define VPHELPER_STR(VPADR, VPADRVAR, STRLEN, RXFPTR, TXFPTR ) { .VP=VPADR, .memadr=VPADRVAR, .size=STRLEN, \ .set_by_display_handler = RXFPTR, .send_to_display_handler = TXFPTR } +float tmp_z_offset = getZOffset_mm(); + const struct DGUS_VP_Variable ListOfVP[] PROGMEM = { // Back button state VPHELPER(VP_BACK_BUTTON_STATE, nullptr, nullptr, ScreenHandler.SendBusyState), @@ -619,7 +621,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = { VPHELPER(SP_Y_POSITION, nullptr, nullptr, ScreenHandler.SendAxisTrustValue), VPHELPER(SP_Z_POSITION, nullptr, nullptr, ScreenHandler.SendAxisTrustValue), - VPHELPER(VP_Z_OFFSET, &probe.offset.z, ScreenHandler.HandleZoffsetChange, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<2>), + VPHELPER(VP_Z_OFFSET, &tmp_z_offset, ScreenHandler.HandleZoffsetChange, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<2>), VPHELPER(VP_FAN_TOGGLE, &thermalManager.fan_speed[0], nullptr, ScreenHandler.DGUSLCD_SendFanStatusToDisplay), VPHELPER(VP_Fan0_Percentage, &thermalManager.fan_speed[0], ScreenHandler.HandleFanSpeedChanged, ScreenHandler.DGUSLCD_SendFanSpeedToDisplay), diff --git a/Marlin/src/lcd/extui/dgus_creality/creality_touch/FilamentLoadUnloadHandler.cpp b/Marlin/src/lcd/extui/dgus_creality/creality_touch/FilamentLoadUnloadHandler.cpp index 181d38ba81..04a84697a3 100644 --- a/Marlin/src/lcd/extui/dgus_creality/creality_touch/FilamentLoadUnloadHandler.cpp +++ b/Marlin/src/lcd/extui/dgus_creality/creality_touch/FilamentLoadUnloadHandler.cpp @@ -42,7 +42,7 @@ void FilamentLoadUnloadHandler::HandleLoadUnloadButton(DGUS_VP_Variable &var, vo } if (ExtUI::isPrinting() && !ExtUI::isPrintingPaused()) { - SetStatusMessage(PSTR("Please pause print first")); + SetStatusMessage(PSTR("Finish Printing First")); return; }