bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merge pull request #7812 from thinkyhead/bf2_fix_resume_print

Browse Source 
[2.0.x] Fix broken M600 resume_print
This commit is contained in:
Scott Lahteine 2017-10-01 22:55:28 -05:00 committed by GitHub
commit 33c4d45f2f
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/feature/pause.cpp
View File

@ -268,6 +268,8 @@ void resume_print(const float &load_length/*=0*/, const float &initial_extrude_l
filament_change_beep(max_beep_count, true); filament_change_beep(max_beep_count, true);
#endif #endif
set_destination_to_current();
if (load_length != 0) { if (load_length != 0) {
#if ENABLED(ULTIPANEL) #if ENABLED(ULTIPANEL)
// Show "insert filament" // Show "insert filament"

2
Marlin/src/gcode/feature/caselight/M355.cpp
View File

@ -46,7 +46,7 @@ void GcodeSuite::M355() {
if (parser.seenval('P')) { if (parser.seenval('P')) {
++args, case_light_brightness = parser.value_byte(); ++args, case_light_brightness = parser.value_byte();
case_light_arg_flag = false; case_light_arg_flag = false;
} }
if (parser.seenval('S')) { if (parser.seenval('S')) {
++args, case_light_on = parser.value_bool(); ++args, case_light_on = parser.value_bool();
case_light_arg_flag = true; case_light_arg_flag = true;

1
platformio.ini
View File

@ -148,4 +148,3 @@ debug_server =
-speed -speed
auto auto
-noir -noir