Przeglądaj źródła

🩹 Warn about user feedback requirement

Scott Lahteine 2 lat temu
rodzic
commit
6b9b2c5d73

+ 1
- 1
Marlin/src/feature/mmu/mmu2.cpp Wyświetl plik

@@ -962,7 +962,7 @@ bool MMU2::eject_filament(const uint8_t index, const bool recover) {
962 962
     BUZZ(200, 404);
963 963
     TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, PSTR("MMU2 Eject Recover"), CONTINUE_STR));
964 964
     TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("MMU2 Eject Recover")));
965
-    wait_for_user_response();
965
+    TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());
966 966
     BUZZ(200, 404);
967 967
     BUZZ(200, 404);
968 968
 

+ 1
- 1
Marlin/src/feature/pause.cpp Wyświetl plik

@@ -522,7 +522,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
522 522
 
523 523
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_HEATER_TIMEOUT)));
524 524
 
525
-      wait_for_user_response(0, true); // Wait for LCD click or M108
525
+      TERN_(HAS_RESUME_CONTINUE, wait_for_user_response(0, true)); // Wait for LCD click or M108
526 526
 
527 527
       TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_INFO, GET_TEXT(MSG_REHEATING)));
528 528
 

+ 1
- 1
Marlin/src/gcode/lcd/M0_M1.cpp Wyświetl plik

@@ -83,7 +83,7 @@ void GcodeSuite::M0_M1() {
83 83
 
84 84
   TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, parser.codenum ? PSTR("M1 Stop") : PSTR("M0 Stop"), CONTINUE_STR));
85 85
 
86
-  wait_for_user_response(ms);
86
+  TERN_(HAS_RESUME_CONTINUE, wait_for_user_response(ms));
87 87
 
88 88
   TERN_(HAS_LCD_MENU, ui.reset_status());
89 89
 }

+ 1
- 1
Marlin/src/gcode/sd/M1001.cpp Wyświetl plik

@@ -97,7 +97,7 @@ void GcodeSuite::M1001() {
97 97
       printerEventLEDs.onPrintCompleted();
98 98
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_PRINT_DONE)));
99 99
       TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT(MSG_PRINT_DONE), CONTINUE_STR));
100
-      wait_for_user_response(SEC_TO_MS(TERN(HAS_LCD_MENU, PE_LEDS_COMPLETED_TIME, 30)));
100
+      TERN_(HAS_RESUME_CONTINUE, wait_for_user_response(SEC_TO_MS(TERN(HAS_LCD_MENU, PE_LEDS_COMPLETED_TIME, 30))));
101 101
       printerEventLEDs.onResumeAfterWait();
102 102
     }
103 103
   #endif

+ 4
- 0
Marlin/src/inc/SanityCheck.h Wyświetl plik

@@ -999,6 +999,10 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
999 999
   static_assert(WITHIN(npp_xyz.z, Z_MIN_POS, Z_MAX_POS), "NOZZLE_PARK_POINT.Z is out of bounds (Z_MIN_POS, Z_MAX_POS).");
1000 1000
 #endif
1001 1001
 
1002
+#if !HAS_RESUME_CONTINUE && DISABLED(HOST_PROMPT_SUPPORT) && DISABLED(EXTENSIBLE_UI)
1003
+  #warning "Your Configuration provides no method to acquire user feedback!"
1004
+#endif
1005
+
1002 1006
 /**
1003 1007
  * Instant Freeze
1004 1008
  */

+ 4
- 4
Marlin/src/lcd/menu/menu_delta_calibrate.cpp Wyświetl plik

@@ -54,9 +54,9 @@ void _man_probe_pt(const xy_pos_t &xy) {
54 54
 
55 55
 #if ENABLED(DELTA_AUTO_CALIBRATION)
56 56
 
57
-  #include "../../MarlinCore.h" // for wait_for_user_response()
58
-  #include "../../gcode/gcode.h"
59
-
57
+  #if HAS_RESUME_CONTINUE
58
+    #include "../../MarlinCore.h" // for wait_for_user_response()
59
+  #endif
60 60
   #if ENABLED(HOST_PROMPT_SUPPORT)
61 61
     #include "../../feature/host_actions.h" // for host_prompt_do
62 62
   #endif
@@ -66,7 +66,7 @@ void _man_probe_pt(const xy_pos_t &xy) {
66 66
     ui.defer_status_screen();
67 67
     TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Delta Calibration in progress"), CONTINUE_STR));
68 68
     TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("Delta Calibration in progress")));
69
-    wait_for_user_response();
69
+    TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());
70 70
     ui.goto_previous_screen_no_defer();
71 71
     return current_position.z;
72 72
   }

+ 2
- 2
Marlin/src/module/probe.cpp Wyświetl plik

@@ -141,7 +141,7 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
141 141
       ui.return_to_status();
142 142
 
143 143
       TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Deploy TouchMI"), CONTINUE_STR));
144
-      wait_for_user_response();
144
+      TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());
145 145
       ui.reset_status();
146 146
       ui.goto_screen(prev_screen);
147 147
 
@@ -298,7 +298,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
298 298
       TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Stow Probe"), CONTINUE_STR));
299 299
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("Stow Probe")));
300 300
       TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Popup_Confirm(ICON_BLTouch, PSTR("Stow Probe"), CONTINUE_STR));
301
-      wait_for_user_response();
301
+      TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());
302 302
       ui.reset_status();
303 303
 
304 304
     } while (ENABLED(PAUSE_PROBE_DEPLOY_WHEN_TRIGGERED));

Ładowanie…
Anuluj
Zapisz