ManuelW/grbl-LPC-CoreXY
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

acceleration management is disabled during arc-motions until the two can be made to play nice together

Browse Source
This commit is contained in:
Simen Svale Skogsrud 2011-02-03 13:12:47 +01:00
parent e68e9cdf7c
commit f4b9da1ecb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
motion_control.c
View File

@ -96,7 +96,7 @@ void mc_line(double x, double y, double z, double feed_rate, int invert_feed_rat
void mc_arc(double theta, double angular_travel, double radius, double linear_travel, int axis_1, int axis_2, void mc_arc(double theta, double angular_travel, double radius, double linear_travel, int axis_1, int axis_2,
int axis_linear, double feed_rate, int invert_feed_rate) int axis_linear, double feed_rate, int invert_feed_rate)
{ {
//plan_disable_acceleration_management(); // disable acceleration management for the duration of the arc plan_disable_acceleration_management(); // disable acceleration management for the duration of the arc
double millimeters_of_travel = hypot(angular_travel*radius, labs(linear_travel)); double millimeters_of_travel = hypot(angular_travel*radius, labs(linear_travel));
if (millimeters_of_travel == 0.0) { return; } if (millimeters_of_travel == 0.0) { return; }
uint16_t segments = ceil(millimeters_of_travel/settings.mm_per_arc_segment); uint16_t segments = ceil(millimeters_of_travel/settings.mm_per_arc_segment);
@ -123,7 +123,7 @@ void mc_arc(double theta, double angular_travel, double radius, double linear_tr
target[axis_2] = center_y+cos(theta)*radius; target[axis_2] = center_y+cos(theta)*radius;
mc_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], feed_rate, invert_feed_rate); mc_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], feed_rate, invert_feed_rate);
} }
//mc_set_acceleration_manager_enabled(acceleration_management_enabled); // restore acceleration management setting mc_set_acceleration_manager_enabled(acceleration_management_enabled); // restore acceleration management setting
} }
void mc_go_home() void mc_go_home()