zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Optimize "Dismiss" string

Browse source
This commit is contained in:
Scott Lahteine 2020-02-14 00:05:06 -06:00
parent 00ba053c90
commit 073e4443e8
6 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/MarlinCore.cpp
View file

@ -345,7 +345,7 @@ void disable_all_steppers() {
void event_probe_recover() { void event_probe_recover() {
#if ENABLED(HOST_PROMPT_SUPPORT) #if ENABLED(HOST_PROMPT_SUPPORT)
host_prompt_do(PROMPT_INFO, PSTR("G29 Retrying"), PSTR("Dismiss")); host_prompt_do(PROMPT_INFO, PSTR("G29 Retrying"), DISMISS_STR);
#endif #endif
#ifdef ACTION_ON_G29_RECOVER #ifdef ACTION_ON_G29_RECOVER
host_action(PSTR(ACTION_ON_G29_RECOVER)); host_action(PSTR(ACTION_ON_G29_RECOVER));

3
Marlin/src/feature/host_actions.cpp
View file

@ -64,7 +64,8 @@ void host_action(const char * const pstr, const bool eol) {
#if ENABLED(HOST_PROMPT_SUPPORT) #if ENABLED(HOST_PROMPT_SUPPORT)
const char CONTINUE_STR[] PROGMEM = "Continue"; const char CONTINUE_STR[] PROGMEM = "Continue",
DISMISS_STR[] PROGMEM = "Dismiss";
#if HAS_RESUME_CONTINUE #if HAS_RESUME_CONTINUE
extern bool wait_for_user; extern bool wait_for_user;

2
Marlin/src/feature/host_actions.h
View file

@ -46,7 +46,7 @@ void host_action(const char * const pstr, const bool eol=true);
#if ENABLED(HOST_PROMPT_SUPPORT) #if ENABLED(HOST_PROMPT_SUPPORT)
extern const char CONTINUE_STR[]; extern const char CONTINUE_STR[], DISMISS_STR[];
enum PromptReason : uint8_t { enum PromptReason : uint8_t {
PROMPT_NOT_DEFINED, PROMPT_NOT_DEFINED,

4
Marlin/src/feature/pause.cpp
View file

@ -396,7 +396,7 @@ bool pause_print(const float &retract, const xyz_pos_t &park_point, const float
#endif #endif
#if ENABLED(HOST_PROMPT_SUPPORT) #if ENABLED(HOST_PROMPT_SUPPORT)
host_prompt_open(PROMPT_INFO, PSTR("Pause"), PSTR("Dismiss")); host_prompt_open(PROMPT_INFO, PSTR("Pause"), DISMISS_STR);
#endif #endif
if (!DEBUGGING(DRYRUN) && unload_length && thermalManager.targetTooColdToExtrude(active_extruder)) { if (!DEBUGGING(DRYRUN) && unload_length && thermalManager.targetTooColdToExtrude(active_extruder)) {
@ -667,7 +667,7 @@ void resume_print(const float &slow_load_length/*=0*/, const float &fast_load_le
--did_pause_print; --did_pause_print;
#if ENABLED(HOST_PROMPT_SUPPORT) #if ENABLED(HOST_PROMPT_SUPPORT)
host_prompt_open(PROMPT_INFO, PSTR("Resuming"), PSTR("Dismiss")); host_prompt_open(PROMPT_INFO, PSTR("Resuming"), DISMISS_STR);
#endif #endif
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)

2
Marlin/src/gcode/sdcard/M24_M25.cpp
View file

@ -74,7 +74,7 @@ void GcodeSuite::M24() {
host_action_resume(); host_action_resume();
#endif #endif
#if ENABLED(HOST_PROMPT_SUPPORT) #if ENABLED(HOST_PROMPT_SUPPORT)
host_prompt_open(PROMPT_INFO, PSTR("Resuming SD"), PSTR("Dismiss")); host_prompt_open(PROMPT_INFO, PSTR("Resuming SD"), DISMISS_STR);
#endif #endif
#endif #endif

2
Marlin/src/lcd/ultralcd.cpp
View file

@ -1504,7 +1504,7 @@ void MarlinUI::update() {
host_action_cancel(); host_action_cancel();
#endif #endif
#if ENABLED(HOST_PROMPT_SUPPORT) #if ENABLED(HOST_PROMPT_SUPPORT)
host_prompt_open(PROMPT_INFO, PSTR("UI Aborted"), PSTR("Dismiss")); host_prompt_open(PROMPT_INFO, PSTR("UI Aborted"), DISMISS_STR);
#endif #endif
print_job_timer.stop(); print_job_timer.stop();
set_status_P(GET_TEXT(MSG_PRINT_ABORTED)); set_status_P(GET_TEXT(MSG_PRINT_ABORTED));