Browse Source

Default argument to defer_status_screen

Scott Lahteine 6 years ago
parent
commit
d8329d858d

+ 1
- 1
Marlin/src/lcd/menu/menu.cpp View File

357
 
357
 
358
   void lcd_babystep_zoffset() {
358
   void lcd_babystep_zoffset() {
359
     if (ui.use_click()) return ui.goto_previous_screen_no_defer();
359
     if (ui.use_click()) return ui.goto_previous_screen_no_defer();
360
-    ui.defer_status_screen(true);
360
+    ui.defer_status_screen();
361
     #if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
361
     #if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
362
       const bool do_probe = (active_extruder == 0);
362
       const bool do_probe = (active_extruder == 0);
363
     #else
363
     #else

+ 1
- 1
Marlin/src/lcd/menu/menu_bed_corners.cpp View File

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

+ 1
- 1
Marlin/src/lcd/menu/menu_bed_leveling.cpp View File

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

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

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

+ 1
- 1
Marlin/src/lcd/menu/menu_filament.cpp View File

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

+ 1
- 1
Marlin/src/lcd/menu/menu_job_recovery.cpp View File

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

+ 2
- 2
Marlin/src/lcd/menu/menu_mixer.cpp View File

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

+ 2
- 2
Marlin/src/lcd/menu/menu_mmu2.cpp View File

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

+ 1
- 1
Marlin/src/lcd/menu/menu_motion.cpp View File

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

+ 1
- 1
Marlin/src/lcd/menu/menu_sdcard.cpp View File

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

+ 3
- 3
Marlin/src/lcd/menu/menu_tune.cpp View File

84
   #if ENABLED(BABYSTEP_XY)
84
   #if ENABLED(BABYSTEP_XY)
85
     void _lcd_babystep_x() { _lcd_babystep(X_AXIS, PSTR(MSG_BABYSTEP_X)); }
85
     void _lcd_babystep_x() { _lcd_babystep(X_AXIS, PSTR(MSG_BABYSTEP_X)); }
86
     void _lcd_babystep_y() { _lcd_babystep(Y_AXIS, PSTR(MSG_BABYSTEP_Y)); }
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
   #endif
89
   #endif
90
 
90
 
91
   #if DISABLED(BABYSTEP_ZPROBE_OFFSET)
91
   #if DISABLED(BABYSTEP_ZPROBE_OFFSET)
92
     void _lcd_babystep_z() { _lcd_babystep(Z_AXIS, PSTR(MSG_BABYSTEP_Z)); }
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
   #endif
94
   #endif
95
 
95
 
96
 #endif // BABYSTEPPING
96
 #endif // BABYSTEPPING

+ 3
- 3
Marlin/src/lcd/menu/menu_ubl.cpp View File

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

+ 1
- 1
Marlin/src/lcd/ultralcd.h View File

430
       static void lcd_in_status(const bool inStatus);
430
       static void lcd_in_status(const bool inStatus);
431
     #endif
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
       #if LCD_TIMEOUT_TO_STATUS
434
       #if LCD_TIMEOUT_TO_STATUS
435
         defer_return_to_status = defer;
435
         defer_return_to_status = defer;
436
       #else
436
       #else

Loading…
Cancel
Save