Browse Source

Merge pull request #7812 from thinkyhead/bf2_fix_resume_print

[2.0.x] Fix broken M600 resume_print
Scott Lahteine 7 years ago
parent
commit
33c4d45f2f
3 changed files with 3 additions and 2 deletions
  1. 2
    0
      Marlin/src/feature/pause.cpp
  2. 1
    1
      Marlin/src/gcode/feature/caselight/M355.cpp
  3. 0
    1
      platformio.ini

+ 2
- 0
Marlin/src/feature/pause.cpp View File

268
     filament_change_beep(max_beep_count, true);
268
     filament_change_beep(max_beep_count, true);
269
   #endif
269
   #endif
270
 
270
 
271
+  set_destination_to_current();
272
+
271
   if (load_length != 0) {
273
   if (load_length != 0) {
272
     #if ENABLED(ULTIPANEL)
274
     #if ENABLED(ULTIPANEL)
273
       // Show "insert filament"
275
       // Show "insert filament"

+ 1
- 1
Marlin/src/gcode/feature/caselight/M355.cpp View File

46
     if (parser.seenval('P')) {
46
     if (parser.seenval('P')) {
47
       ++args, case_light_brightness = parser.value_byte();
47
       ++args, case_light_brightness = parser.value_byte();
48
       case_light_arg_flag = false;
48
       case_light_arg_flag = false;
49
-    }  
49
+    }
50
     if (parser.seenval('S')) {
50
     if (parser.seenval('S')) {
51
       ++args, case_light_on = parser.value_bool();
51
       ++args, case_light_on = parser.value_bool();
52
       case_light_arg_flag = true;
52
       case_light_arg_flag = true;

+ 0
- 1
platformio.ini View File

148
   -speed
148
   -speed
149
   auto
149
   auto
150
   -noir
150
   -noir
151
-  

Loading…
Cancel
Save