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

cleaned up methods for enabling/disabling acceleration manger

Browse Source
This commit is contained in:
Simen Svale Skogsrud
2011-02-06 22:25:01 +01:00
parent 7092b0e1fe
commit cdcc7bf86e
4 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
motion_control.c
View File

@ -31,12 +31,10 @@
// The current position of the tool in absolute steps
int32_t position[3];
int8_t acceleration_management_enabled;
void mc_init()
{
clear_vector(position);
acceleration_management_enabled = TRUE;
}
void mc_dwell(uint32_t milliseconds)
@ -45,15 +43,6 @@ void mc_dwell(uint32_t milliseconds)
_delay_ms(milliseconds);
}
void mc_set_acceleration_manager_enabled(uint8_t enabled) {
if (enabled) {
plan_enable_acceleration_management();
} else {
plan_disable_acceleration_management();
}
acceleration_management_enabled = enabled;
}
// Execute linear motion in absolute millimeter coordinates. Feed rate given in millimeters/second
// unless invert_feed_rate is true. Then the feed_rate means that the motion should be completed in
// 1/feed_rate minutes.
@ -96,7 +85,8 @@ 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,
int axis_linear, double feed_rate, int invert_feed_rate)
{
plan_disable_acceleration_management(); // disable acceleration management for the duration of the arc
int acceleration_manager_was_enabled = plan_is_acceleration_manager_enabled();
plan_set_acceleration_manager_enabled(FALSE); // disable acceleration management for the duration of the arc
double millimeters_of_travel = hypot(angular_travel*radius, labs(linear_travel));
if (millimeters_of_travel == 0.0) { return; }
uint16_t segments = ceil(millimeters_of_travel/settings.mm_per_arc_segment);
@ -122,8 +112,8 @@ void mc_arc(double theta, double angular_travel, double radius, double linear_tr
target[axis_1] = center_x+sin(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_set_acceleration_manager_enabled(acceleration_management_enabled); // restore acceleration management setting
}
plan_set_acceleration_manager_enabled(acceleration_manager_was_enabled);
}
void mc_go_home()