From ee1e8dfccc64ee3604a8e00f95cb243d7fc3c6dc Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Wed, 20 Jun 2018 17:58:31 +0200 Subject: [PATCH 1/3] set default printer message when recovering from crash detection and at the end of mesh bed leveling --- Firmware/Marlin_main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index ed801c990..d242f9030 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -4397,6 +4397,7 @@ void process_commands() } KEEPALIVE_STATE(NOT_BUSY); // Restore custom message state + lcd_setstatuspgm(_T(WELCOME_MSG)); custom_message = custom_message_old; custom_message_type = custom_message_type_old; custom_message_state = custom_message_state_old; @@ -8940,8 +8941,8 @@ void restore_print_from_ram_and_continue(float e_move) else { //not sd printing nor usb printing } + lcd_setstatuspgm(_T(WELCOME_MSG)); saved_printing = false; - } void print_world_coordinates() From 7b816638838f945013b17f4bda78f6ee38b88ce8 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 21 Jun 2018 22:16:45 +0200 Subject: [PATCH 2/3] crash detection/stop print erroneous movements hotfix --- Firmware/Marlin_main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index ed801c990..dc38a130e 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7317,6 +7317,7 @@ void clamp_to_software_endstops(float target[3]) float de = e - current_position[E_AXIS]; for (int i = 1; i < n_segments; ++ i) { float t = float(i) / float(n_segments); + if (saved_printing || (mbl.active == false)) return; plan_buffer_line( current_position[X_AXIS] + t * dx, current_position[Y_AXIS] + t * dy, From a83475bf7c0edb133fcf95fef3b9db6e28fe5055 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 21 Jun 2018 22:18:10 +0200 Subject: [PATCH 3/3] whitespace --- Firmware/Marlin_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index dc38a130e..411d1dd7c 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7317,7 +7317,7 @@ void clamp_to_software_endstops(float target[3]) float de = e - current_position[E_AXIS]; for (int i = 1; i < n_segments; ++ i) { float t = float(i) / float(n_segments); - if (saved_printing || (mbl.active == false)) return; + if (saved_printing || (mbl.active == false)) return; plan_buffer_line( current_position[X_AXIS] + t * dx, current_position[Y_AXIS] + t * dy,