From 802f1476869c78951749667e821f4a6e8959ce1b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 1 Oct 2017 18:24:53 -0500
Subject: [PATCH 1/2] Remove some excess whitepsace

---
 Marlin/Marlin_main.cpp         | 4 ++--
 Marlin/ultralcd_impl_HD44780.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 9f285f5374..9b73fb06d8 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -5662,7 +5662,7 @@ void home_all_axes() { gcode_G28(true); }
           float a_sum = 0.0;
           LOOP_XYZ(axis) a_sum += delta_tower_angle_trim[axis];
           LOOP_XYZ(axis) delta_tower_angle_trim[axis] -= a_sum / 3.0;
-          
+
           // adjust delta_height and endstops by the max amount
           const float z_temp = MAX3(endstop_adj[A_AXIS], endstop_adj[B_AXIS], endstop_adj[C_AXIS]);
           home_offset[Z_AXIS] -= z_temp;
@@ -8564,7 +8564,7 @@ inline void gcode_M205() {
     #endif
     LOOP_XYZ(i) {
       if (parser.seen(axis_codes[i])) {
-        if (parser.value_linear_units() * Z_HOME_DIR <= 0)         
+        if (parser.value_linear_units() * Z_HOME_DIR <= 0)
           endstop_adj[i] = parser.value_linear_units();
         #if ENABLED(DEBUG_LEVELING_FEATURE)
           if (DEBUGGING(LEVELING)) {
diff --git a/Marlin/ultralcd_impl_HD44780.h b/Marlin/ultralcd_impl_HD44780.h
index b8d8aa534a..b1b4cbe2bf 100644
--- a/Marlin/ultralcd_impl_HD44780.h
+++ b/Marlin/ultralcd_impl_HD44780.h
@@ -790,11 +790,11 @@ static void lcd_implementation_status_screen() {
     lcd.setCursor(LCD_WIDTH - 8, 1);
     _draw_axis_label(Z_AXIS, PSTR(MSG_Z), blink);
     lcd.print(ftostr52sp(FIXFLOAT(current_position[Z_AXIS])));
-    
+
     #if HAS_LEVELING
       lcd.write(leveling_is_active() || blink ? '_' : ' ');
     #endif
-  
+
   #endif // LCD_HEIGHT > 2
 
   //

From 40a4a716e144ca71c26579b7d96b547c89d5832e Mon Sep 17 00:00:00 2001
From: MasterPIC <armando_unina@yahoo.it>
Date: Thu, 28 Sep 2017 02:48:02 +0200
Subject: [PATCH 2/2] Fix filament change bug in resume_print

Expected behaviour: while (auto)extruding the new filament, the nozzle should not move. It should move (from filament replacement position to printing position) only after the user has confirmed the successful filament replacement and extrusion.

Actual behaviour: while (auto)extruding the new filament, the nozzle moves from filament replacement position back to printing position.
So the extrusion step is mixed with the movement required to go back to the printing position.

The provided code seems to be working but probably a better fix is required.
---
 Marlin/Marlin_main.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 9b73fb06d8..b046b5e0de 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -6353,6 +6353,8 @@ inline void gcode_M17() {
       filament_change_beep(max_beep_count, true);
     #endif
 
+    set_destination_to_current();
+
     if (load_length != 0) {
       #if ENABLED(ULTIPANEL)
         // Show "insert filament"