jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

S1 and E3 Touch Updates

Browse Source
This commit is contained in:
InsanityAutomation
2022-03-02 12:37:18 -05:00
parent 9e66a87122
commit 70c26fd4ca
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CR6E3Touch_NextGen_TM3D.7z
BIN
View File
Binary file not shown.
Marlin/Configuration.h
+5 -5
View File
@@ -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.
Marlin/src/inc/Conditionals_post.h
+2 -2
View File
@@ -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
Marlin/src/lcd/extui/dgus_creality/creality_touch/DGUSDisplayDef.cpp
+3 -1
View File
@@ -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<Y_AXIS>),
VPHELPER(SP_Z_POSITION, nullptr, nullptr, ScreenHandler.SendAxisTrustValue<Z_AXIS>),
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),
Marlin/src/lcd/extui/dgus_creality/creality_touch/FilamentLoadUnloadHandler.cpp
+1 -1
View File
@@ -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;
}