Browse Source

Remove hidden dependencies on destination. Fixes #10686. (#10691)

ManuelMcLure 7 years ago
parent
commit
613a3be167
2 changed files with 5 additions and 5 deletions
  1. 1
    1
      Marlin/src/gcode/motion/G2_G3.cpp
  2. 4
    4
      Marlin/src/gcode/motion/G5.cpp

+ 1
- 1
Marlin/src/gcode/motion/G2_G3.cpp View File

226
   // As far as the parser is concerned, the position is now == target. In reality the
226
   // As far as the parser is concerned, the position is now == target. In reality the
227
   // motion control system might still be processing the action and the real tool position
227
   // motion control system might still be processing the action and the real tool position
228
   // in any intermediate location.
228
   // in any intermediate location.
229
-  set_current_from_destination();
229
+  COPY(current_position, cart);
230
 } // plan_arc
230
 } // plan_arc
231
 
231
 
232
 /**
232
 /**

+ 4
- 4
Marlin/src/gcode/motion/G5.cpp View File

27
 #include "../../module/motion.h"
27
 #include "../../module/motion.h"
28
 #include "../../module/planner_bezier.h"
28
 #include "../../module/planner_bezier.h"
29
 
29
 
30
-void plan_cubic_move(const float (&offset)[4]) {
31
-  cubic_b_spline(current_position, destination, offset, MMS_SCALED(feedrate_mm_s), active_extruder);
30
+void plan_cubic_move(const float (&cart)[XYZE], const float (&offset)[4]) {
31
+  cubic_b_spline(current_position, cart, offset, MMS_SCALED(feedrate_mm_s), active_extruder);
32
 
32
 
33
   // As far as the parser is concerned, the position is now == destination. In reality the
33
   // As far as the parser is concerned, the position is now == destination. In reality the
34
   // motion control system might still be processing the action and the real tool position
34
   // motion control system might still be processing the action and the real tool position
35
   // in any intermediate location.
35
   // in any intermediate location.
36
-  set_current_from_destination();
36
+  COPY(current_position, cart);
37
 }
37
 }
38
 
38
 
39
 /**
39
 /**
69
       parser.linearval('Q')
69
       parser.linearval('Q')
70
     };
70
     };
71
 
71
 
72
-    plan_cubic_move(offset);
72
+    plan_cubic_move(destination, offset);
73
   }
73
   }
74
 }
74
 }
75
 
75
 

Loading…
Cancel
Save