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

Touchup mesh point updates and M600 fix

Browse Source
This commit is contained in:
InsanityAutomation
2020-12-12 17:44:03 -05:00
parent 2dcdbf6f36
commit f6627c0352
3 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/src/lcd/extui/dgus_creality_lcd.cpp
+3 -7
View File
@@ -182,16 +182,10 @@ bool hasPrintTimer = false;
}
void onMeshUpdate(const int8_t xpos, const int8_t ypos, const float zval) {
}
void onMeshUpdate(const int8_t xpos, const int8_t ypos, const ExtUI::probe_state_t state) {
}
void onMeshCallback(const int8_t xpos, const int8_t ypos, const float zval) {
ScreenHandler.OnMeshLevelingUpdate(xpos, ypos);
}
void onMeshCallback(const int8_t xpos, const int8_t ypos, const ExtUI::probe_state_t state) {
void onMeshUpdate(const int8_t xpos, const int8_t ypos, const ExtUI::probe_state_t state) {
// Only called for UBL
if (state == MESH_START) {
ScreenHandler.OnMeshLevelingStart();
@@ -199,6 +193,8 @@ bool hasPrintTimer = false;
ScreenHandler.OnMeshLevelingUpdate(xpos, ypos);
}
#endif
#if ENABLED(POWER_LOSS_RECOVERY)
Marlin/src/lcd/extui/lib/dgus_creality/DGUSScreenHandler.cpp
-7
View File
@@ -453,13 +453,6 @@ bool DGUSScreenHandler::HandlePendingUserConfirmation() {
return false;
}
// Switch to the resume screen
ScreenHandler.GotoScreen(DGUSLCD_SCREEN_PRINT_RUNNING);
while (!ScreenHandler.loop()); // Wait while anything is left to be sent
// Give DWIN a chance to catch up
delay(250);
// We might be re-entrant here
ExtUI::setUserConfirmed();
Marlin/src/lcd/extui/lib/dgus_creality/creality_touch/PageHandlers.cpp
+15 -6
View File
@@ -163,13 +163,22 @@ void PrintRunningMenuHandler(DGUS_VP_Variable &var, unsigned short buttonValue)
void PrintPausedMenuHandler(DGUS_VP_Variable &var, unsigned short buttonValue) {
switch (var.VP) {
case VP_BUTTON_RESUMEPRINTKEY:
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
//SERIAL_ECHOLN("Handling VP_BUTTON_RESUMEPRINTKEY");
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
runout.reset();
#endif
if (!ScreenHandler.HandlePendingUserConfirmation()) {
ExtUI::resumePrint();
ScreenHandler.GotoScreen(DGUSLCD_SCREEN_PRINT_RUNNING);
//SERIAL_ECHOLN("Runout Reset");
#endif
if(ExtUI::isWaitingOnUser()) {
ScreenHandler.HandlePendingUserConfirmation();
//SERIAL_ECHOLN("User Confirmed");
}
else if(ExtUI::isPrintingFromMediaPaused()) {
//SERIAL_ECHOLN("SD Resume");
ExtUI::resumePrint();
}
//SERIAL_ECHOLN("Reasons handled");
if(!ExtUI::isMoving()) {
ScreenHandler.GotoScreen(DGUSLCD_SCREEN_PRINT_RUNNING);
}
break;
}