Browse Source

Add missing ExtUI user confirmation (#14992)

InsanityAutomation 4 years ago
parent
commit
af5a7a2925

+ 13
- 0
Marlin/src/feature/pause.cpp View File

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

+ 7
- 0
Marlin/src/feature/prusa_MMU2/mmu2.cpp View File

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

+ 7
- 0
Marlin/src/gcode/config/M43.cpp View File

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

+ 3
- 0
Marlin/src/gcode/lcd/M0_M1.cpp View File

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

+ 7
- 0
Marlin/src/lcd/menu/menu_delta_calibrate.cpp View File

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

+ 7
- 0
Marlin/src/module/probe.cpp View File

79
   #include "stepper_indirection.h"
79
   #include "stepper_indirection.h"
80
 #endif
80
 #endif
81
 
81
 
82
+#if ENABLED(EXTENSIBLE_UI)
83
+  #include "../lcd/extensible_ui/ui_api.h"
84
+#endif
85
+
82
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
86
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
83
 #include "../core/debug_out.h"
87
 #include "../core/debug_out.h"
84
 
88
 
371
       #if ENABLED(HOST_PROMPT_SUPPORT)
375
       #if ENABLED(HOST_PROMPT_SUPPORT)
372
         host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Stow Probe"), PSTR("Continue"));
376
         host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Stow Probe"), PSTR("Continue"));
373
       #endif
377
       #endif
378
+      #if ENABLED(EXTENSIBLE_UI)
379
+        ExtUI::onStatusChanged(PSTR("Stow Probe"));
380
+      #endif
374
       while (wait_for_user) idle();
381
       while (wait_for_user) idle();
375
       ui.reset_status();
382
       ui.reset_status();
376
 
383
 

Loading…
Cancel
Save