Browse Source

Add ExtUI::onStatusChanged_P (#17543)

vanilla_fb_2.0.x
Desuuuu 5 years ago
committed by GitHub
parent
commit
2824e67d95
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      Marlin/src/feature/pause.cpp
  2. 6
      Marlin/src/lcd/extui/ui_api.cpp
  3. 1
      Marlin/src/lcd/extui/ui_api.h

2
Marlin/src/feature/pause.cpp

@ -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)); host_prompt_do(PROMPT_INFO, GET_TEXT(MSG_REHEATING));
#endif #endif
#if ENABLED(EXTENSIBLE_UI) #if ENABLED(EXTENSIBLE_UI)
ExtUI::onStatusChanged(GET_TEXT(MSG_REHEATING)); ExtUI::onStatusChanged_P(GET_TEXT(MSG_REHEATING));
#endif #endif
// Re-enable the heaters if they timed out // Re-enable the heaters if they timed out

6
Marlin/src/lcd/extui/ui_api.cpp

@ -1071,6 +1071,12 @@ namespace ExtUI {
onUserConfirmRequired(msg); onUserConfirmRequired(msg);
} }
void onStatusChanged_P(PGM_P const pstr) {
char msg[strlen_P(pstr) + 1];
strcpy_P(msg, pstr);
onStatusChanged(msg);
}
FileList::FileList() { refresh(); } FileList::FileList() { refresh(); }
void FileList::refresh() { num_files = 0xFFFF; } void FileList::refresh() { num_files = 0xFFFF; }

1
Marlin/src/lcd/extui/ui_api.h

@ -339,6 +339,7 @@ namespace ExtUI {
void onUserConfirmRequired(const char * const msg); void onUserConfirmRequired(const char * const msg);
void onUserConfirmRequired_P(PGM_P const pstr); void onUserConfirmRequired_P(PGM_P const pstr);
void onStatusChanged(const char * const msg); void onStatusChanged(const char * const msg);
void onStatusChanged_P(PGM_P const pstr);
void onFactoryReset(); void onFactoryReset();
void onStoreSettings(char *); void onStoreSettings(char *);
void onLoadSettings(const char *); void onLoadSettings(const char *);

Loading…
Cancel
Save