From 4ecc00e4e3bdd9f4657857d138224a31f6b30f19 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 26 Oct 2018 18:19:00 +0200 Subject: [PATCH 1/4] M600: move extruder 100mm to the left to make space for opening idler --- Firmware/Marlin_main.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index da18ee3d..a2e7a048 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -2956,8 +2956,13 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float lcd_change_fil_state = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Was filament unload successful?"), false, true); ////MSG_UNLOAD_SUCCESSFUL c=20 r=2 if (lcd_change_fil_state == 0) - lcd_show_fullscreen_message_and_wait_P(_i("Please open idler and remove filament manually."));////MSG_CHECK_IDLER c=20 r=4 - lcd_update_enable(true); + { + current_position[X_AXIS] -= 100; + plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], + current_position[E_AXIS], FILAMENTCHANGE_XYFEED, active_extruder); + lcd_show_fullscreen_message_and_wait_P(_i("Please open idler and remove filament manually."));////MSG_CHECK_IDLER c=20 r=4 + lcd_update_enable(true); + } } if (mmu_enabled) From 934b76ade302107be6ebf9b122578d4570e36559 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 5 Nov 2018 00:12:46 +0100 Subject: [PATCH 2/4] wait message added --- Firmware/Marlin_main.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index a2e7a048..37d8fe6e 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -2957,9 +2957,13 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float false, true); ////MSG_UNLOAD_SUCCESSFUL c=20 r=2 if (lcd_change_fil_state == 0) { + lcd_clear(); + lcd_set_cursor(0, 2); + lcd_puts_P(_T(MSG_PLEASE_WAIT)); current_position[X_AXIS] -= 100; plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], FILAMENTCHANGE_XYFEED, active_extruder); + st_synchronize(); lcd_show_fullscreen_message_and_wait_P(_i("Please open idler and remove filament manually."));////MSG_CHECK_IDLER c=20 r=4 lcd_update_enable(true); } From b058ec7120ce7222fe6aff796afeb156f54bf7fc Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 5 Nov 2018 00:14:16 +0100 Subject: [PATCH 3/4] whitespace --- Firmware/Marlin_main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 37d8fe6e..483279fe 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -2958,8 +2958,8 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float if (lcd_change_fil_state == 0) { lcd_clear(); - lcd_set_cursor(0, 2); - lcd_puts_P(_T(MSG_PLEASE_WAIT)); + lcd_set_cursor(0, 2); + lcd_puts_P(_T(MSG_PLEASE_WAIT)); current_position[X_AXIS] -= 100; plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], FILAMENTCHANGE_XYFEED, active_extruder); From aeeb2af0a442f0f447e4832ba252f246ca960eb9 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 5 Nov 2018 00:15:36 +0100 Subject: [PATCH 4/4] whitespace --- Firmware/Marlin_main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 483279fe..52ca7477 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -2956,7 +2956,7 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float lcd_change_fil_state = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Was filament unload successful?"), false, true); ////MSG_UNLOAD_SUCCESSFUL c=20 r=2 if (lcd_change_fil_state == 0) - { + { lcd_clear(); lcd_set_cursor(0, 2); lcd_puts_P(_T(MSG_PLEASE_WAIT)); @@ -2966,7 +2966,7 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float st_synchronize(); lcd_show_fullscreen_message_and_wait_P(_i("Please open idler and remove filament manually."));////MSG_CHECK_IDLER c=20 r=4 lcd_update_enable(true); - } + } } if (mmu_enabled)