zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
ManuelMcLure 2018-05-10 22:30:51 -07:00 committed by Scott Lahteine
parent 23a876b08d
commit 613a3be167
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/gcode/motion/G2_G3.cpp
View file

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

8
Marlin/src/gcode/motion/G5.cpp
View file

@ -27,13 +27,13 @@
#include "../../module/motion.h" #include "../../module/motion.h"
#include "../../module/planner_bezier.h" #include "../../module/planner_bezier.h"
void plan_cubic_move(const float (&offset)[4]) { void plan_cubic_move(const float (&cart)[XYZE], const float (&offset)[4]) {
cubic_b_spline(current_position, destination, offset, MMS_SCALED(feedrate_mm_s), active_extruder); cubic_b_spline(current_position, cart, offset, MMS_SCALED(feedrate_mm_s), active_extruder);
// As far as the parser is concerned, the position is now == destination. In reality the // As far as the parser is concerned, the position is now == destination. In reality the
// motion control system might still be processing the action and the real tool position // motion control system might still be processing the action and the real tool position
// in any intermediate location. // in any intermediate location.
set_current_from_destination(); COPY(current_position, cart);
} }
/** /**
@ -69,7 +69,7 @@ void GcodeSuite::G5() {
parser.linearval('Q') parser.linearval('Q')
}; };
plan_cubic_move(offset); plan_cubic_move(destination, offset);
} }
} }