Explorar el Código

🐛 Fix PAUSE_MESSAGE_PAUSING=>PARKING

Fixes #22250. Regression from #17460.
Scott Lahteine hace 3 años
padre
commit
14d40fb957

+ 2
- 2
Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp Ver fichero

@@ -238,7 +238,7 @@ void lv_draw_dialog(uint8_t type) {
238 238
     lv_obj_t *labelOk = lv_label_create_empty(btnOk);             // Add a label to the button
239 239
     lv_label_set_text(labelOk, print_file_dialog_menu.confirm);    // Set the labels text
240 240
   }
241
-  else if (DIALOG_IS(PAUSE_MESSAGE_PAUSING, PAUSE_MESSAGE_CHANGING, PAUSE_MESSAGE_UNLOAD, PAUSE_MESSAGE_LOAD, PAUSE_MESSAGE_PURGE, PAUSE_MESSAGE_RESUME, PAUSE_MESSAGE_HEATING)) {
241
+  else if (DIALOG_IS(PAUSE_MESSAGE_PARKING, PAUSE_MESSAGE_CHANGING, PAUSE_MESSAGE_UNLOAD, PAUSE_MESSAGE_LOAD, PAUSE_MESSAGE_PURGE, PAUSE_MESSAGE_RESUME, PAUSE_MESSAGE_HEATING)) {
242 242
     // nothing to do
243 243
   }
244 244
   else if (DIALOG_IS(WIFI_ENABLE_TIPS)) {
@@ -324,7 +324,7 @@ void lv_draw_dialog(uint8_t type) {
324 324
     lv_label_set_text(labelDialog, print_file_dialog_menu.print_finish);
325 325
     lv_obj_align(labelDialog, nullptr, LV_ALIGN_CENTER, 0, -20);
326 326
   }
327
-  else if (DIALOG_IS(PAUSE_MESSAGE_PAUSING)) {
327
+  else if (DIALOG_IS(PAUSE_MESSAGE_PARKING)) {
328 328
     lv_label_set_text(labelDialog, pause_msg_menu.pausing);
329 329
     lv_obj_align(labelDialog, nullptr, LV_ALIGN_CENTER, 0, -20);
330 330
   }

+ 1
- 1
Marlin/src/lcd/extui/mks_ui/draw_dialog.h Ver fichero

@@ -54,7 +54,7 @@ enum {
54 54
 
55 55
   DIALOG_WIFI_ENABLE_TIPS,
56 56
 
57
-  DIALOG_PAUSE_MESSAGE_PAUSING,
57
+  DIALOG_PAUSE_MESSAGE_PARKING,
58 58
   DIALOG_PAUSE_MESSAGE_CHANGING,
59 59
   DIALOG_PAUSE_MESSAGE_UNLOAD,
60 60
   DIALOG_PAUSE_MESSAGE_WAITING,

+ 1
- 1
Marlin/src/lcd/extui/mks_ui/draw_pause_message.cpp Ver fichero

@@ -31,7 +31,7 @@
31 31
 
32 32
 void lv_draw_pause_message(const PauseMessage msg) {
33 33
   switch (msg) {
34
-    case PAUSE_MESSAGE_PAUSING:  clear_cur_ui(); lv_draw_dialog(DIALOG_PAUSE_MESSAGE_PAUSING); break;
34
+    case PAUSE_MESSAGE_PARKING:  clear_cur_ui(); lv_draw_dialog(DIALOG_PAUSE_MESSAGE_PARKING); break;
35 35
     case PAUSE_MESSAGE_CHANGING: clear_cur_ui(); lv_draw_dialog(DIALOG_PAUSE_MESSAGE_CHANGING); break;
36 36
     case PAUSE_MESSAGE_UNLOAD:   clear_cur_ui(); lv_draw_dialog(DIALOG_PAUSE_MESSAGE_UNLOAD); break;
37 37
     case PAUSE_MESSAGE_WAITING:  clear_cur_ui(); lv_draw_dialog(DIALOG_PAUSE_MESSAGE_WAITING); break;

Loading…
Cancelar
Guardar