소스 검색

Minor cleanup of pause code (#13030)

Giuliano Zaro 6 년 전
부모
커밋
a79d80c78e
3개의 변경된 파일5개의 추가작업 그리고 9개의 파일을 삭제
  1. 2
    6
      Marlin/src/feature/pause.cpp
  2. 1
    1
      Marlin/src/gcode/feature/pause/M125.cpp
  3. 2
    2
      Marlin/src/lcd/menu/menu_main.cpp

+ 2
- 6
Marlin/src/feature/pause.cpp 파일 보기

329
     host_action_pause();
329
     host_action_pause();
330
   #endif
330
   #endif
331
 
331
 
332
-  #if HAS_LCD_MENU
333
-    if (show_lcd) lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_INIT, ADVANCED_PAUSE_MODE_PAUSE_PRINT);
334
-  #else
335
-    UNUSED(show_lcd);
336
-  #endif
337
-
338
   if (!DEBUGGING(DRYRUN) && unload_length && thermalManager.targetTooColdToExtrude(active_extruder)) {
332
   if (!DEBUGGING(DRYRUN) && unload_length && thermalManager.targetTooColdToExtrude(active_extruder)) {
339
     SERIAL_ECHO_MSG(MSG_ERR_HOTEND_TOO_COLD);
333
     SERIAL_ECHO_MSG(MSG_ERR_HOTEND_TOO_COLD);
340
 
334
 
343
         lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_STATUS);
337
         lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_STATUS);
344
         LCD_MESSAGEPGM(MSG_M600_TOO_COLD);
338
         LCD_MESSAGEPGM(MSG_M600_TOO_COLD);
345
       }
339
       }
340
+    #else
341
+      UNUSED(show_lcd);
346
     #endif
342
     #endif
347
 
343
 
348
     return false; // unable to reach safe temperature
344
     return false; // unable to reach safe temperature

+ 1
- 1
Marlin/src/gcode/feature/pause/M125.cpp 파일 보기

79
   #endif
79
   #endif
80
 
80
 
81
   #if HAS_LCD_MENU
81
   #if HAS_LCD_MENU
82
+    lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_INIT, ADVANCED_PAUSE_MODE_PAUSE_PRINT);
82
     const bool show_lcd = parser.seenval('P');
83
     const bool show_lcd = parser.seenval('P');
83
-    lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_INIT, ADVANCED_PAUSE_MODE_PAUSE_PRINT, active_extruder);
84
   #else
84
   #else
85
     constexpr bool show_lcd = false;
85
     constexpr bool show_lcd = false;
86
   #endif
86
   #endif

+ 2
- 2
Marlin/src/lcd/menu/menu_main.cpp 파일 보기

48
   #endif
48
   #endif
49
 
49
 
50
   #if ENABLED(PARK_HEAD_ON_PAUSE)
50
   #if ENABLED(PARK_HEAD_ON_PAUSE)
51
-    lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_INIT, ADVANCED_PAUSE_MODE_PAUSE_PRINT, active_extruder);
52
-    enqueue_and_echo_commands_P(PSTR("M25 P; \n M24"));
51
+    lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_INIT, ADVANCED_PAUSE_MODE_PAUSE_PRINT);  // Show message immediately to let user know about pause in progress
52
+    enqueue_and_echo_commands_P(PSTR("M25 P\nM24"));
53
   #elif ENABLED(SDSUPPORT)
53
   #elif ENABLED(SDSUPPORT)
54
     enqueue_and_echo_commands_P(PSTR("M25"));
54
     enqueue_and_echo_commands_P(PSTR("M25"));
55
   #elif defined(ACTION_ON_PAUSE)
55
   #elif defined(ACTION_ON_PAUSE)

Loading…
취소
저장