Browse Source

Optimize "Dismiss" string

Scott Lahteine 4 years ago
parent
commit
073e4443e8

+ 1
- 1
Marlin/src/MarlinCore.cpp View File

345
 
345
 
346
   void event_probe_recover() {
346
   void event_probe_recover() {
347
     #if ENABLED(HOST_PROMPT_SUPPORT)
347
     #if ENABLED(HOST_PROMPT_SUPPORT)
348
-      host_prompt_do(PROMPT_INFO, PSTR("G29 Retrying"), PSTR("Dismiss"));
348
+      host_prompt_do(PROMPT_INFO, PSTR("G29 Retrying"), DISMISS_STR);
349
     #endif
349
     #endif
350
     #ifdef ACTION_ON_G29_RECOVER
350
     #ifdef ACTION_ON_G29_RECOVER
351
       host_action(PSTR(ACTION_ON_G29_RECOVER));
351
       host_action(PSTR(ACTION_ON_G29_RECOVER));

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

64
 
64
 
65
 #if ENABLED(HOST_PROMPT_SUPPORT)
65
 #if ENABLED(HOST_PROMPT_SUPPORT)
66
 
66
 
67
-  const char CONTINUE_STR[] PROGMEM = "Continue";
67
+  const char CONTINUE_STR[] PROGMEM = "Continue",
68
+             DISMISS_STR[] PROGMEM = "Dismiss";
68
 
69
 
69
   #if HAS_RESUME_CONTINUE
70
   #if HAS_RESUME_CONTINUE
70
     extern bool wait_for_user;
71
     extern bool wait_for_user;

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

46
 
46
 
47
 #if ENABLED(HOST_PROMPT_SUPPORT)
47
 #if ENABLED(HOST_PROMPT_SUPPORT)
48
 
48
 
49
-  extern const char CONTINUE_STR[];
49
+  extern const char CONTINUE_STR[], DISMISS_STR[];
50
 
50
 
51
   enum PromptReason : uint8_t {
51
   enum PromptReason : uint8_t {
52
     PROMPT_NOT_DEFINED,
52
     PROMPT_NOT_DEFINED,

+ 2
- 2
Marlin/src/feature/pause.cpp View File

396
   #endif
396
   #endif
397
 
397
 
398
   #if ENABLED(HOST_PROMPT_SUPPORT)
398
   #if ENABLED(HOST_PROMPT_SUPPORT)
399
-    host_prompt_open(PROMPT_INFO, PSTR("Pause"), PSTR("Dismiss"));
399
+    host_prompt_open(PROMPT_INFO, PSTR("Pause"), DISMISS_STR);
400
   #endif
400
   #endif
401
 
401
 
402
   if (!DEBUGGING(DRYRUN) && unload_length && thermalManager.targetTooColdToExtrude(active_extruder)) {
402
   if (!DEBUGGING(DRYRUN) && unload_length && thermalManager.targetTooColdToExtrude(active_extruder)) {
667
   --did_pause_print;
667
   --did_pause_print;
668
 
668
 
669
   #if ENABLED(HOST_PROMPT_SUPPORT)
669
   #if ENABLED(HOST_PROMPT_SUPPORT)
670
-    host_prompt_open(PROMPT_INFO, PSTR("Resuming"), PSTR("Dismiss"));
670
+    host_prompt_open(PROMPT_INFO, PSTR("Resuming"), DISMISS_STR);
671
   #endif
671
   #endif
672
 
672
 
673
   #if ENABLED(SDSUPPORT)
673
   #if ENABLED(SDSUPPORT)

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

74
       host_action_resume();
74
       host_action_resume();
75
     #endif
75
     #endif
76
     #if ENABLED(HOST_PROMPT_SUPPORT)
76
     #if ENABLED(HOST_PROMPT_SUPPORT)
77
-      host_prompt_open(PROMPT_INFO, PSTR("Resuming SD"), PSTR("Dismiss"));
77
+      host_prompt_open(PROMPT_INFO, PSTR("Resuming SD"), DISMISS_STR);
78
     #endif
78
     #endif
79
   #endif
79
   #endif
80
 
80
 

+ 1
- 1
Marlin/src/lcd/ultralcd.cpp View File

1504
       host_action_cancel();
1504
       host_action_cancel();
1505
     #endif
1505
     #endif
1506
     #if ENABLED(HOST_PROMPT_SUPPORT)
1506
     #if ENABLED(HOST_PROMPT_SUPPORT)
1507
-      host_prompt_open(PROMPT_INFO, PSTR("UI Aborted"), PSTR("Dismiss"));
1507
+      host_prompt_open(PROMPT_INFO, PSTR("UI Aborted"), DISMISS_STR);
1508
     #endif
1508
     #endif
1509
     print_job_timer.stop();
1509
     print_job_timer.stop();
1510
     set_status_P(GET_TEXT(MSG_PRINT_ABORTED));
1510
     set_status_P(GET_TEXT(MSG_PRINT_ABORTED));

Loading…
Cancel
Save