From 2d41c593203c8c53ec85b4988b38425579272bee Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 1 Oct 2017 18:35:39 -0500 Subject: [PATCH 1/2] Tweak some spacing --- Marlin/src/gcode/feature/caselight/M355.cpp | 2 +- platformio.ini | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Marlin/src/gcode/feature/caselight/M355.cpp b/Marlin/src/gcode/feature/caselight/M355.cpp index b8faaffe0..0e61ff5e0 100644 --- a/Marlin/src/gcode/feature/caselight/M355.cpp +++ b/Marlin/src/gcode/feature/caselight/M355.cpp @@ -46,7 +46,7 @@ void GcodeSuite::M355() { if (parser.seenval('P')) { ++args, case_light_brightness = parser.value_byte(); case_light_arg_flag = false; - } + } if (parser.seenval('S')) { ++args, case_light_on = parser.value_bool(); case_light_arg_flag = true; diff --git a/platformio.ini b/platformio.ini index 5d5dc25a2..b2a2030f9 100644 --- a/platformio.ini +++ b/platformio.ini @@ -148,4 +148,3 @@ debug_server = -speed auto -noir - \ No newline at end of file From a03e70d46cfc467f16bc070187ae449bf222bf09 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 1 Oct 2017 18:36:18 -0500 Subject: [PATCH 2/2] Fix M600 resume_print Derived from #7811 and #7779 --- Marlin/src/feature/pause.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp index 7c7f7c006..025352ab4 100644 --- a/Marlin/src/feature/pause.cpp +++ b/Marlin/src/feature/pause.cpp @@ -268,6 +268,8 @@ void resume_print(const float &load_length/*=0*/, const float &initial_extrude_l filament_change_beep(max_beep_count, true); #endif + set_destination_to_current(); + if (load_length != 0) { #if ENABLED(ULTIPANEL) // Show "insert filament"