Преглед на файлове

Default argument to defer_status_screen

Scott Lahteine преди 6 години
родител
ревизия
d8329d858d

+ 1
- 1
Marlin/src/lcd/menu/menu.cpp Целия файл

@@ -357,7 +357,7 @@ void MarlinUI::completion_feedback(const bool good/*=true*/) {
357 357
 
358 358
   void lcd_babystep_zoffset() {
359 359
     if (ui.use_click()) return ui.goto_previous_screen_no_defer();
360
-    ui.defer_status_screen(true);
360
+    ui.defer_status_screen();
361 361
     #if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
362 362
       const bool do_probe = (active_extruder == 0);
363 363
     #else

+ 1
- 1
Marlin/src/lcd/menu/menu_bed_corners.cpp Целия файл

@@ -101,7 +101,7 @@ void _lcd_level_bed_corners_homing() {
101 101
 }
102 102
 
103 103
 void _lcd_level_bed_corners() {
104
-  ui.defer_status_screen(true);
104
+  ui.defer_status_screen();
105 105
   if (!all_axes_known()) {
106 106
     set_all_unhomed();
107 107
     enqueue_and_echo_commands_P(PSTR("G28"));

+ 1
- 1
Marlin/src/lcd/menu/menu_bed_leveling.cpp Целия файл

@@ -191,7 +191,7 @@
191 191
   // Step 2: Continue Bed Leveling...
192 192
   //
193 193
   void _lcd_level_bed_continue() {
194
-    ui.defer_status_screen(true);
194
+    ui.defer_status_screen();
195 195
     set_all_unhomed();
196 196
     ui.goto_screen(_lcd_level_bed_homing);
197 197
     enqueue_and_echo_commands_P(PSTR("G28"));

+ 1
- 1
Marlin/src/lcd/menu/menu_delta_calibrate.cpp Целия файл

@@ -50,7 +50,7 @@ void _man_probe_pt(const float &rx, const float &ry) {
50 50
   float lcd_probe_pt(const float &rx, const float &ry) {
51 51
     _man_probe_pt(rx, ry);
52 52
     KEEPALIVE_STATE(PAUSED_FOR_USER);
53
-    ui.defer_status_screen(true);
53
+    ui.defer_status_screen();
54 54
     wait_for_user = true;
55 55
     #if ENABLED(HOST_PROMPT_SUPPORT)
56 56
       host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Delta Calibration in progress"), PSTR("Continue"));

+ 1
- 1
Marlin/src/lcd/menu/menu_filament.cpp Целия файл

@@ -528,7 +528,7 @@ void lcd_pause_show_message(
528 528
   hotend_status_extruder = extruder;
529 529
   const screenFunc_t next_screen = ap_message_screen(message);
530 530
   if (next_screen) {
531
-    ui.defer_status_screen(true);
531
+    ui.defer_status_screen();
532 532
     ui.goto_screen(next_screen);
533 533
   }
534 534
   else

+ 1
- 1
Marlin/src/lcd/menu/menu_job_recovery.cpp Целия файл

@@ -45,7 +45,7 @@ static void lcd_power_loss_recovery_cancel() {
45 45
 }
46 46
 
47 47
 void menu_job_recovery() {
48
-  ui.defer_status_screen(true);
48
+  ui.defer_status_screen();
49 49
   START_MENU();
50 50
   STATIC_ITEM(MSG_OUTAGE_RECOVERY);
51 51
   MENU_ITEM(function, MSG_RESUME_PRINT, lcd_power_loss_recovery_resume);

+ 2
- 2
Marlin/src/lcd/menu/menu_mixer.cpp Целия файл

@@ -40,7 +40,7 @@
40 40
 #if ENABLED(GRADIENT_MIX)
41 41
 
42 42
   void lcd_mixer_gradient_z_start_edit() {
43
-    ui.defer_status_screen(true);
43
+    ui.defer_status_screen();
44 44
     ui.encoder_direction_normal();
45 45
     ENCODER_RATE_MULTIPLY(true);
46 46
     if (ui.encoderPosition != 0) {
@@ -65,7 +65,7 @@
65 65
   }
66 66
 
67 67
   void lcd_mixer_gradient_z_end_edit() {
68
-    ui.defer_status_screen(true);
68
+    ui.defer_status_screen();
69 69
     ui.encoder_direction_normal();
70 70
     ENCODER_RATE_MULTIPLY(true);
71 71
     if (ui.encoderPosition != 0) {

+ 2
- 2
Marlin/src/lcd/menu/menu_mmu2.cpp Целия файл

@@ -197,14 +197,14 @@ void menu_mmu2_pause() {
197 197
 }
198 198
 
199 199
 void mmu2_M600() {
200
-  ui.defer_status_screen(true);
200
+  ui.defer_status_screen();
201 201
   ui.goto_screen(menu_mmu2_pause);
202 202
   mmuMenuWait = true;
203 203
   while (mmuMenuWait) idle();
204 204
 }
205 205
 
206 206
 uint8_t mmu2_chooseFilament() {
207
-  ui.defer_status_screen(true);
207
+  ui.defer_status_screen();
208 208
   ui.goto_screen(menu_mmu2_chooseFilament);
209 209
   mmuMenuWait = true;
210 210
   while (mmuMenuWait) idle();

+ 1
- 1
Marlin/src/lcd/menu/menu_motion.cpp Целия файл

@@ -235,7 +235,7 @@ inline void lcd_move_e() { _lcd_move_e(); }
235 235
 screenFunc_t _manual_move_func_ptr;
236 236
 
237 237
 void _goto_manual_move(const float scale) {
238
-  ui.defer_status_screen(true);
238
+  ui.defer_status_screen();
239 239
   move_menu_scale = scale;
240 240
   ui.goto_screen(_manual_move_func_ptr);
241 241
 }

+ 1
- 1
Marlin/src/lcd/menu/menu_sdcard.cpp Целия файл

@@ -64,7 +64,7 @@ void lcd_sd_updir() {
64 64
     goto_screen(menu_sdcard, last_sdfile_encoderPosition);
65 65
     last_sdfile_encoderPosition = 0xFFFF;
66 66
 
67
-    defer_status_screen(true);
67
+    defer_status_screen();
68 68
 
69 69
     //#if HAS_GRAPHICAL_LCD
70 70
     //  update();

+ 3
- 3
Marlin/src/lcd/menu/menu_tune.cpp Целия файл

@@ -84,13 +84,13 @@
84 84
   #if ENABLED(BABYSTEP_XY)
85 85
     void _lcd_babystep_x() { _lcd_babystep(X_AXIS, PSTR(MSG_BABYSTEP_X)); }
86 86
     void _lcd_babystep_y() { _lcd_babystep(Y_AXIS, PSTR(MSG_BABYSTEP_Y)); }
87
-    void lcd_babystep_x() { ui.goto_screen(_lcd_babystep_x); babysteps_done = 0; ui.defer_status_screen(true); }
88
-    void lcd_babystep_y() { ui.goto_screen(_lcd_babystep_y); babysteps_done = 0; ui.defer_status_screen(true); }
87
+    void lcd_babystep_x() { ui.goto_screen(_lcd_babystep_x); babysteps_done = 0; ui.defer_status_screen(); }
88
+    void lcd_babystep_y() { ui.goto_screen(_lcd_babystep_y); babysteps_done = 0; ui.defer_status_screen(); }
89 89
   #endif
90 90
 
91 91
   #if DISABLED(BABYSTEP_ZPROBE_OFFSET)
92 92
     void _lcd_babystep_z() { _lcd_babystep(Z_AXIS, PSTR(MSG_BABYSTEP_Z)); }
93
-    void lcd_babystep_z() { ui.goto_screen(_lcd_babystep_z); babysteps_done = 0; ui.defer_status_screen(true); }
93
+    void lcd_babystep_z() { ui.goto_screen(_lcd_babystep_z); babysteps_done = 0; ui.defer_status_screen(); }
94 94
   #endif
95 95
 
96 96
 #endif // BABYSTEPPING

+ 3
- 3
Marlin/src/lcd/menu/menu_ubl.cpp Целия файл

@@ -51,7 +51,7 @@ float mesh_edit_value, mesh_edit_accumulator; // We round mesh_edit_value to 2.5
51 51
 static int16_t ubl_encoderPosition = 0;
52 52
 
53 53
 static void _lcd_mesh_fine_tune(PGM_P msg) {
54
-  ui.defer_status_screen(true);
54
+  ui.defer_status_screen();
55 55
   if (ubl.encoder_diff) {
56 56
     ubl_encoderPosition = (ubl.encoder_diff > 0) ? 1 : -1;
57 57
     ubl.encoder_diff = 0;
@@ -74,7 +74,7 @@ static void _lcd_mesh_fine_tune(PGM_P msg) {
74 74
 }
75 75
 
76 76
 void _lcd_mesh_edit_NOP() {
77
-  ui.defer_status_screen(true);
77
+  ui.defer_status_screen();
78 78
 }
79 79
 
80 80
 float lcd_mesh_edit() {
@@ -408,7 +408,7 @@ void _lcd_ubl_storage_mesh() {
408 408
 void _lcd_ubl_output_map_lcd();
409 409
 
410 410
 void _lcd_ubl_map_homing() {
411
-  ui.defer_status_screen(true);
411
+  ui.defer_status_screen();
412 412
   _lcd_draw_homing();
413 413
   if (all_axes_homed()) {
414 414
     ubl.lcd_map_control = true; // Return to the map screen

+ 1
- 1
Marlin/src/lcd/ultralcd.h Целия файл

@@ -430,7 +430,7 @@ public:
430 430
       static void lcd_in_status(const bool inStatus);
431 431
     #endif
432 432
 
433
-    static inline void defer_status_screen(const bool defer) {
433
+    static inline void defer_status_screen(const bool defer=true) {
434 434
       #if LCD_TIMEOUT_TO_STATUS
435 435
         defer_return_to_status = defer;
436 436
       #else

Loading…
Отказ
Запис