瀏覽代碼

Add ExtUI::onStatusChanged_P (#17543)

Desuuuu 5 年之前
父節點
當前提交
2824e67d95
No account linked to committer's email address
共有 3 個文件被更改,包括 8 次插入1 次删除
  1. 1
    1
      Marlin/src/feature/pause.cpp
  2. 6
    0
      Marlin/src/lcd/extui/ui_api.cpp
  3. 1
    0
      Marlin/src/lcd/extui/ui_api.h

+ 1
- 1
Marlin/src/feature/pause.cpp 查看文件

@@ -536,7 +536,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
536 536
         host_prompt_do(PROMPT_INFO, GET_TEXT(MSG_REHEATING));
537 537
       #endif
538 538
       #if ENABLED(EXTENSIBLE_UI)
539
-        ExtUI::onStatusChanged(GET_TEXT(MSG_REHEATING));
539
+        ExtUI::onStatusChanged_P(GET_TEXT(MSG_REHEATING));
540 540
       #endif
541 541
 
542 542
       // Re-enable the heaters if they timed out

+ 6
- 0
Marlin/src/lcd/extui/ui_api.cpp 查看文件

@@ -1071,6 +1071,12 @@ namespace ExtUI {
1071 1071
     onUserConfirmRequired(msg);
1072 1072
   }
1073 1073
 
1074
+  void onStatusChanged_P(PGM_P const pstr) {
1075
+    char msg[strlen_P(pstr) + 1];
1076
+    strcpy_P(msg, pstr);
1077
+    onStatusChanged(msg);
1078
+  }
1079
+
1074 1080
   FileList::FileList() { refresh(); }
1075 1081
 
1076 1082
   void FileList::refresh() { num_files = 0xFFFF; }

+ 1
- 0
Marlin/src/lcd/extui/ui_api.h 查看文件

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

Loading…
取消
儲存