Browse Source

Remove PROMPT_INFO / PROMPT_GCODE_INFO (#15210)

Scott Lahteine 5 years ago
parent
commit
841c8ce0d9
No account linked to committer's email address

+ 0
- 3
Marlin/src/feature/host_actions.cpp View File

@@ -154,9 +154,6 @@ void host_action(const char * const pstr, const bool eol) {
154 154
           queue.inject_P(PSTR("M24"));
155 155
         #endif
156 156
         break;
157
-      case PROMPT_INFO:
158
-        msg = PSTR("GCODE_INFO");
159
-        break;
160 157
       default: break;
161 158
     }
162 159
     say_m876_response(msg);

+ 1
- 2
Marlin/src/feature/host_actions.h View File

@@ -53,8 +53,7 @@ void host_action(const char * const pstr, const bool eol=true);
53 53
     PROMPT_FILAMENT_RUNOUT,
54 54
     PROMPT_USER_CONTINUE,
55 55
     PROMPT_FILAMENT_RUNOUT_REHEAT,
56
-    PROMPT_PAUSE_RESUME,
57
-    PROMPT_INFO
56
+    PROMPT_PAUSE_RESUME
58 57
   };
59 58
 
60 59
   extern PromptReason host_prompt_reason;

+ 0
- 7
Marlin/src/feature/pause.cpp View File

@@ -399,9 +399,6 @@ bool pause_print(const float &retract, const point_t &park_point, const float &u
399 399
     #elif defined(ACTION_ON_PAUSE)
400 400
       host_action_pause();
401 401
     #endif
402
-    #if ENABLED(HOST_PROMPT_SUPPORT)
403
-      host_prompt_open(PROMPT_INFO, PSTR("Pause"));
404
-    #endif
405 402
   #endif
406 403
 
407 404
   if (!DEBUGGING(DRYRUN) && unload_length && thermalManager.targetTooColdToExtrude(active_extruder)) {
@@ -677,10 +674,6 @@ void resume_print(const float &slow_load_length/*=0*/, const float &fast_load_le
677 674
 
678 675
   --did_pause_print;
679 676
 
680
-  #if ENABLED(HOST_PROMPT_SUPPORT)
681
-    host_prompt_open(PROMPT_INFO, PSTR("Resume"));
682
-  #endif
683
-
684 677
   #if ENABLED(SDSUPPORT)
685 678
     if (did_pause_print) {
686 679
       card.startFileprint();

+ 0
- 3
Marlin/src/gcode/sdcard/M24_M25.cpp View File

@@ -61,9 +61,6 @@ void GcodeSuite::M24() {
61 61
   }
62 62
 
63 63
   #if ENABLED(HOST_ACTION_COMMANDS)
64
-    #if ENABLED(HOST_PROMPT_SUPPORT)
65
-      host_prompt_open(PROMPT_INFO, PSTR("Resume SD"));
66
-    #endif
67 64
     #ifdef ACTION_ON_RESUME
68 65
       host_action_resume();
69 66
     #endif

+ 0
- 3
Marlin/src/lcd/ultralcd.cpp View File

@@ -1480,9 +1480,6 @@ void MarlinUI::update() {
1480 1480
     #ifdef ACTION_ON_CANCEL
1481 1481
       host_action_cancel();
1482 1482
     #endif
1483
-    #if ENABLED(HOST_PROMPT_SUPPORT)
1484
-      host_prompt_open(PROMPT_INFO, PSTR("UI Abort"));
1485
-    #endif
1486 1483
     print_job_timer.stop();
1487 1484
     set_status_P(PSTR(MSG_PRINT_ABORTED));
1488 1485
     #if HAS_LCD_MENU

+ 2
- 2
Marlin/src/lcd/ultralcd.h View File

@@ -95,8 +95,8 @@
95 95
 
96 96
     #if ENABLED(ADVANCED_PAUSE_FEATURE)
97 97
       void lcd_pause_show_message(const PauseMessage message,
98
-                                           const PauseMode mode=PAUSE_MODE_SAME,
99
-                                           const uint8_t extruder=active_extruder);
98
+                                  const PauseMode mode=PAUSE_MODE_SAME,
99
+                                  const uint8_t extruder=active_extruder);
100 100
     #endif
101 101
 
102 102
     #if ENABLED(AUTO_BED_LEVELING_UBL)

Loading…
Cancel
Save