Skip to content

Add ExtUI::onStatusChanged_P function #17543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thinkyhead merged 1 commit into from
Apr 16, 2020
Merged

Add ExtUI::onStatusChanged_P function #17543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Marlin/src/feature/pause.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
host_prompt_do(PROMPT_INFO, GET_TEXT(MSG_REHEATING));
#endif
#if ENABLED(EXTENSIBLE_UI)
ExtUI::onStatusChanged(GET_TEXT(MSG_REHEATING));
ExtUI::onStatusChanged_P(GET_TEXT(MSG_REHEATING));
#endif

// Re-enable the heaters if they timed out
Expand Down
6 changes: 6 additions & 0 deletions Marlin/src/lcd/extui/ui_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1071,6 +1071,12 @@ namespace ExtUI {
onUserConfirmRequired(msg);
}

void onStatusChanged_P(PGM_P const pstr) {
char msg[strlen_P(pstr) + 1];
strcpy_P(msg, pstr);
onStatusChanged(msg);
}

FileList::FileList() { refresh(); }

void FileList::refresh() { num_files = 0xFFFF; }
Expand Down
1 change: 1 addition & 0 deletions Marlin/src/lcd/extui/ui_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,7 @@ namespace ExtUI {
void onUserConfirmRequired(const char * const msg);
void onUserConfirmRequired_P(PGM_P const pstr);
void onStatusChanged(const char * const msg);
void onStatusChanged_P(PGM_P const pstr);
void onFactoryReset();
void onStoreSettings(char *);
void onLoadSettings(const char *);
Expand Down