瀏覽代碼

Add missing ExtUI user confirmation (#14992)

InsanityAutomation 5 年之前
父節點
當前提交
af5a7a2925

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

@@ -187,6 +187,9 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
187 187
       host_action_prompt_button(PSTR("Continue"));
188 188
       host_action_prompt_show();
189 189
     #endif
190
+    #if ENABLED(EXTENSIBLE_UI)
191
+      ExtUI::onStatusChanged(PSTR("Load Filament"));
192
+    #endif
190 193
     while (wait_for_user) {
191 194
       #if HAS_BUZZER
192 195
         filament_change_beep(max_beep_count);
@@ -239,6 +242,9 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
239 242
     #if ENABLED(HOST_PROMPT_SUPPORT)
240 243
       host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Continuous Purge Running..."), PSTR("Continue"));
241 244
     #endif
245
+    #if ENABLED(EXTENSIBLE_UI)
246
+      ExtUI::onStatusChanged(PSTR("Continuous Purge Running..."));
247
+    #endif
242 248
     for (float purge_count = purge_length; purge_count > 0 && wait_for_user; --purge_count)
243 249
       do_pause_e_move(1, ADVANCED_PAUSE_PURGE_FEEDRATE);
244 250
     wait_for_user = false;
@@ -517,6 +523,9 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
517 523
   #if ENABLED(HOST_PROMPT_SUPPORT)
518 524
     host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Nozzle Parked"), PSTR("Continue"));
519 525
   #endif
526
+  #if ENABLED(EXTENSIBLE_UI)
527
+    ExtUI::onStatusChanged(PSTR("Nozzle Parked"));
528
+  #endif
520 529
   while (wait_for_user) {
521 530
     #if HAS_BUZZER
522 531
       filament_change_beep(max_beep_count);
@@ -538,6 +547,10 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
538 547
         host_prompt_do(PROMPT_USER_CONTINUE, PSTR("HeaterTimeout"), PSTR("Reheat"));
539 548
       #endif
540 549
 
550
+      #if ENABLED(EXTENSIBLE_UI)
551
+        ExtUI::onStatusChanged(PSTR("HeaterTimeout"));
552
+      #endif
553
+
541 554
       // Wait for LCD click or M108
542 555
       while (wait_for_user) idle(true);
543 556
 

+ 7
- 0
Marlin/src/feature/prusa_MMU2/mmu2.cpp 查看文件

@@ -42,6 +42,10 @@ MMU2 mmu2;
42 42
   #include "../../feature/host_actions.h"
43 43
 #endif
44 44
 
45
+#if ENABLED(EXTENSIBLE_UI)
46
+  #include "../../lcd/extensible_ui/ui_api.h"
47
+#endif
48
+
45 49
 #define DEBUG_OUT ENABLED(MMU2_DEBUG)
46 50
 #include "../../core/debug_out.h"
47 51
 
@@ -711,6 +715,9 @@ void MMU2::filament_runout() {
711 715
       #if ENABLED(HOST_PROMPT_SUPPORT)
712 716
         host_prompt_do(PROMPT_USER_CONTINUE, PSTR("MMU2 Eject Recover"), PSTR("Continue"));
713 717
       #endif
718
+      #if ENABLED(EXTENSIBLE_UI)
719
+        ExtUI::onStatusChanged(PSTR("MMU2 Eject Recover"));
720
+      #endif
714 721
       while (wait_for_user) idle();
715 722
       BUZZ(200, 404);
716 723
       BUZZ(200, 404);

+ 7
- 0
Marlin/src/gcode/config/M43.cpp 查看文件

@@ -42,6 +42,10 @@
42 42
   #include "../../feature/host_actions.h"
43 43
 #endif
44 44
 
45
+#if ENABLED(EXTENSIBLE_UI)
46
+  #include "../../lcd/extensible_ui/ui_api.h"
47
+#endif
48
+
45 49
 #ifndef GET_PIN_MAP_PIN_M43
46 50
   #define GET_PIN_MAP_PIN_M43(Q) GET_PIN_MAP_PIN(Q)
47 51
 #endif
@@ -329,6 +333,9 @@ void GcodeSuite::M43() {
329 333
       #if ENABLED(HOST_PROMPT_SUPPORT)
330 334
         host_prompt_do(PROMPT_USER_CONTINUE, PSTR("M43 Wait Called"), PSTR("Continue"));
331 335
       #endif
336
+      #if ENABLED(EXTENSIBLE_UI)
337
+        ExtUI::onStatusChanged(PSTR("M43 Wait Called"));
338
+      #endif
332 339
     #endif
333 340
 
334 341
     for (;;) {

+ 3
- 0
Marlin/src/gcode/lcd/M0_M1.cpp 查看文件

@@ -97,6 +97,9 @@ void GcodeSuite::M0_M1() {
97 97
   #if ENABLED(HOST_PROMPT_SUPPORT)
98 98
     host_prompt_do(PROMPT_USER_CONTINUE, PSTR("M0/1 Break Called"), PSTR("Continue"));
99 99
   #endif
100
+  #if ENABLED(EXTENSIBLE_UI)
101
+    ExtUI::onStatusChanged(PSTR("M0/1 Break Called"));
102
+  #endif
100 103
 
101 104
   if (ms > 0) {
102 105
     ms += millis();  // wait until this time for a click

+ 7
- 0
Marlin/src/lcd/menu/menu_delta_calibrate.cpp 查看文件

@@ -36,6 +36,10 @@
36 36
   #include "../../feature/bedlevel/bedlevel.h"
37 37
 #endif
38 38
 
39
+#if ENABLED(EXTENSIBLE_UI)
40
+  #include "../../lcd/extensible_ui/ui_api.h"
41
+#endif
42
+
39 43
 void _man_probe_pt(const float &rx, const float &ry) {
40 44
   do_blocking_move_to(rx, ry, Z_CLEARANCE_BETWEEN_PROBES);
41 45
   ui.synchronize();
@@ -55,6 +59,9 @@ void _man_probe_pt(const float &rx, const float &ry) {
55 59
     #if ENABLED(HOST_PROMPT_SUPPORT)
56 60
       host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Delta Calibration in progress"), PSTR("Continue"));
57 61
     #endif
62
+    #if ENABLED(EXTENSIBLE_UI)
63
+      ExtUI::onStatusChanged(PSTR("Delta Calibration in progress"));
64
+    #endif
58 65
     while (wait_for_user) idle();
59 66
     ui.goto_previous_screen_no_defer();
60 67
     return current_position[Z_AXIS];

+ 7
- 0
Marlin/src/module/probe.cpp 查看文件

@@ -79,6 +79,10 @@ float zprobe_zoffset; // Initialized by settings.load()
79 79
   #include "stepper_indirection.h"
80 80
 #endif
81 81
 
82
+#if ENABLED(EXTENSIBLE_UI)
83
+  #include "../lcd/extensible_ui/ui_api.h"
84
+#endif
85
+
82 86
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
83 87
 #include "../core/debug_out.h"
84 88
 
@@ -371,6 +375,9 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
371 375
       #if ENABLED(HOST_PROMPT_SUPPORT)
372 376
         host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Stow Probe"), PSTR("Continue"));
373 377
       #endif
378
+      #if ENABLED(EXTENSIBLE_UI)
379
+        ExtUI::onStatusChanged(PSTR("Stow Probe"));
380
+      #endif
374 381
       while (wait_for_user) idle();
375 382
       ui.reset_status();
376 383
 

Loading…
取消
儲存