try to improve pause

Frank0587 · Jan 30, 2022 · 38e836d · 38e836d
1 parent bb565f1
commit 38e836d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -71,12 +71,12 @@
 // @section info
 
 // Author info of this build printed to the host during boot and M115
-#define STRING_CONFIG_H_AUTHOR "SP#4" // Who made the changes.
+#define STRING_CONFIG_H_AUTHOR "SP#xx" // Who made the changes.
 
 // Info shown at Info-Screen
-#define HW_FEATURE   "Ender3 V2.SP#4"
+#define HW_FEATURE   "Ender3 V2.SP#xx"
 #define CORP_WEBSITE "github.com/Frank0587"
-#define GIT_BRANCH   "SP#4-bugfix+Jy"
+#define GIT_BRANCH   "SP#xx-dev"
 
 //#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes)
 

diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
@@ -275,7 +275,7 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
           // Show "Purge More" / "Resume" menu and wait for reply
           KEEPALIVE_STATE(PAUSED_FOR_USER);
           wait_for_user = false;
-          #if EITHER(HAS_MARLINUI_MENU, DWIN_CREALITY_LCD_ENHANCED)
+          #if ANY(HAS_MARLINUI_MENU, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI) 
             ui.pause_show_message(PAUSE_MESSAGE_OPTION); // Also sets PAUSE_RESPONSE_WAIT_FOR
           #else
             pause_menu_response = PAUSE_RESPONSE_WAIT_FOR;

diff --git a/Marlin/src/gcode/feature/pause/M125.cpp b/Marlin/src/gcode/feature/pause/M125.cpp
@@ -88,7 +88,11 @@ void GcodeSuite::M125() {
   ui.pause_show_message(PAUSE_MESSAGE_PARKING, PAUSE_MODE_PAUSE_PRINT);
 
   // If possible, show an LCD prompt with the 'P' flag
-  const bool show_lcd = TERN0(HAS_MARLINUI_MENU, parser.boolval('P'));
+  #if EITHER(HAS_LCD_MENU, HAS_DWIN_E3V2)
+    const bool show_lcd = parser.boolval('P');
+  #else
+    const bool show_lcd = 0;
+  #endif
 
   if (pause_print(retract, park_point, show_lcd, 0)) {
     if (ENABLED(EXTENSIBLE_UI) || BOTH(EMERGENCY_PARSER, HOST_PROMPT_SUPPORT) || !sd_printing || show_lcd) {

diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -5522,6 +5522,8 @@ void MarlinUI::init_lcd() {
         break;
       case PAUSE_MESSAGE_HEAT:    CrealityDWIN.Confirm_Handler(HeaterTime); break;
       case PAUSE_MESSAGE_WAITING: CrealityDWIN.Draw_Print_Screen();         break;
+      case PAUSE_MESSAGE_PARKING: CrealityDWIN.Popup_Handler(Pause);    break;
+
       default: break;
     }
   }