SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Default argument to defer_status_screen

Browse source
This commit is contained in:
Scott Lahteine 2019-03-23 16:30:43 -05:00
parent 9562a02c5a
commit d8329d858d
13 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/lcd/menu/menu.cpp
View file

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

2
Marlin/src/lcd/menu/menu_bed_corners.cpp
View file

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

2
Marlin/src/lcd/menu/menu_bed_leveling.cpp
View file

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

2
Marlin/src/lcd/menu/menu_delta_calibrate.cpp
View file

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

2
Marlin/src/lcd/menu/menu_filament.cpp
View file

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

2
Marlin/src/lcd/menu/menu_job_recovery.cpp
View file

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

4
Marlin/src/lcd/menu/menu_mixer.cpp
View file

@ -40,7 +40,7 @@
#if ENABLED(GRADIENT_MIX) #if ENABLED(GRADIENT_MIX)
void lcd_mixer_gradient_z_start_edit() { void lcd_mixer_gradient_z_start_edit() {
ui.defer_status_screen(true); ui.defer_status_screen();
ui.encoder_direction_normal(); ui.encoder_direction_normal();
ENCODER_RATE_MULTIPLY(true); ENCODER_RATE_MULTIPLY(true);
if (ui.encoderPosition != 0) { if (ui.encoderPosition != 0) {
@ -65,7 +65,7 @@
} }
void lcd_mixer_gradient_z_end_edit() { void lcd_mixer_gradient_z_end_edit() {
ui.defer_status_screen(true); ui.defer_status_screen();
ui.encoder_direction_normal(); ui.encoder_direction_normal();
ENCODER_RATE_MULTIPLY(true); ENCODER_RATE_MULTIPLY(true);
if (ui.encoderPosition != 0) { if (ui.encoderPosition != 0) {

4
Marlin/src/lcd/menu/menu_mmu2.cpp
View file

@ -197,14 +197,14 @@ void menu_mmu2_pause() {
} }
void mmu2_M600() { void mmu2_M600() {
ui.defer_status_screen(true); ui.defer_status_screen();
ui.goto_screen(menu_mmu2_pause); ui.goto_screen(menu_mmu2_pause);
mmuMenuWait = true; mmuMenuWait = true;
while (mmuMenuWait) idle(); while (mmuMenuWait) idle();
} }
uint8_t mmu2_chooseFilament() { uint8_t mmu2_chooseFilament() {
ui.defer_status_screen(true); ui.defer_status_screen();
ui.goto_screen(menu_mmu2_chooseFilament); ui.goto_screen(menu_mmu2_chooseFilament);
mmuMenuWait = true; mmuMenuWait = true;
while (mmuMenuWait) idle(); while (mmuMenuWait) idle();

2
Marlin/src/lcd/menu/menu_motion.cpp
View file

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

2
Marlin/src/lcd/menu/menu_sdcard.cpp
View file

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

6
Marlin/src/lcd/menu/menu_tune.cpp
View file

@ -84,13 +84,13 @@
#if ENABLED(BABYSTEP_XY) #if ENABLED(BABYSTEP_XY)
void _lcd_babystep_x() { _lcd_babystep(X_AXIS, PSTR(MSG_BABYSTEP_X)); } void _lcd_babystep_x() { _lcd_babystep(X_AXIS, PSTR(MSG_BABYSTEP_X)); }
void _lcd_babystep_y() { _lcd_babystep(Y_AXIS, PSTR(MSG_BABYSTEP_Y)); } void _lcd_babystep_y() { _lcd_babystep(Y_AXIS, PSTR(MSG_BABYSTEP_Y)); }
void lcd_babystep_x() { ui.goto_screen(_lcd_babystep_x); babysteps_done = 0; ui.defer_status_screen(true); } void lcd_babystep_x() { ui.goto_screen(_lcd_babystep_x); babysteps_done = 0; ui.defer_status_screen(); }
void lcd_babystep_y() { ui.goto_screen(_lcd_babystep_y); babysteps_done = 0; ui.defer_status_screen(true); } void lcd_babystep_y() { ui.goto_screen(_lcd_babystep_y); babysteps_done = 0; ui.defer_status_screen(); }
#endif #endif
#if DISABLED(BABYSTEP_ZPROBE_OFFSET) #if DISABLED(BABYSTEP_ZPROBE_OFFSET)
void _lcd_babystep_z() { _lcd_babystep(Z_AXIS, PSTR(MSG_BABYSTEP_Z)); } void _lcd_babystep_z() { _lcd_babystep(Z_AXIS, PSTR(MSG_BABYSTEP_Z)); }
void lcd_babystep_z() { ui.goto_screen(_lcd_babystep_z); babysteps_done = 0; ui.defer_status_screen(true); } void lcd_babystep_z() { ui.goto_screen(_lcd_babystep_z); babysteps_done = 0; ui.defer_status_screen(); }
#endif #endif
#endif // BABYSTEPPING #endif // BABYSTEPPING

6
Marlin/src/lcd/menu/menu_ubl.cpp
View file

@ -51,7 +51,7 @@ float mesh_edit_value, mesh_edit_accumulator; // We round mesh_edit_value to 2.5
static int16_t ubl_encoderPosition = 0; static int16_t ubl_encoderPosition = 0;
static void _lcd_mesh_fine_tune(PGM_P msg) { static void _lcd_mesh_fine_tune(PGM_P msg) {
ui.defer_status_screen(true); ui.defer_status_screen();
if (ubl.encoder_diff) { if (ubl.encoder_diff) {
ubl_encoderPosition = (ubl.encoder_diff > 0) ? 1 : -1; ubl_encoderPosition = (ubl.encoder_diff > 0) ? 1 : -1;
ubl.encoder_diff = 0; ubl.encoder_diff = 0;
@ -74,7 +74,7 @@ static void _lcd_mesh_fine_tune(PGM_P msg) {
} }
void _lcd_mesh_edit_NOP() { void _lcd_mesh_edit_NOP() {
ui.defer_status_screen(true); ui.defer_status_screen();
} }
float lcd_mesh_edit() { float lcd_mesh_edit() {
@ -408,7 +408,7 @@ void _lcd_ubl_storage_mesh() {
void _lcd_ubl_output_map_lcd(); void _lcd_ubl_output_map_lcd();
void _lcd_ubl_map_homing() { void _lcd_ubl_map_homing() {
ui.defer_status_screen(true); ui.defer_status_screen();
_lcd_draw_homing(); _lcd_draw_homing();
if (all_axes_homed()) { if (all_axes_homed()) {
ubl.lcd_map_control = true; // Return to the map screen ubl.lcd_map_control = true; // Return to the map screen

2
Marlin/src/lcd/ultralcd.h
View file

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