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

eliminated the mc_line-method and replaced it with a macro forwarding calls directly to the planner (untested)

Browse Source
This commit is contained in:
Simen Svale Skogsrud 2011-02-11 00:53:00 +01:00
parent 6dc81b41c9
commit 480f898c2b
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
motion_control.c
View File

@ -39,10 +39,10 @@ void mc_dwell(uint32_t milliseconds)
// Execute linear motion in absolute millimeter coordinates. Feed rate given in millimeters/second // 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 // unless invert_feed_rate is true. Then the feed_rate means that the motion should be completed in
// 1/feed_rate minutes. // 1/feed_rate minutes.
void mc_line(double x, double y, double z, double feed_rate, int invert_feed_rate) // void mc_line(double x, double y, double z, double feed_rate, int invert_feed_rate)
{ // {
plan_buffer_line(x, y, z, feed_rate, invert_feed_rate); // plan_buffer_line(x, y, z, feed_rate, invert_feed_rate);
} // }
// Execute an arc. theta == start angle, angular_travel == number of radians to go along the arc, // Execute an arc. theta == start angle, angular_travel == number of radians to go along the arc,
// positive angular_travel means clockwise, negative means counterclockwise. Radius == the radius of the // positive angular_travel means clockwise, negative means counterclockwise. Radius == the radius of the

7
motion_control.h
View File

@ -22,11 +22,16 @@
#define motion_control_h #define motion_control_h
#include <avr/io.h> #include <avr/io.h>
#include "planner.h"
// Execute linear motion in absolute millimeter coordinates. Feed rate given in millimeters/second // 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 // unless invert_feed_rate is true. Then the feed_rate means that the motion should be completed in
// (1 minute)/feed_rate time. // (1 minute)/feed_rate time.
void mc_line(double x, double y, double z, double feed_rate, int invert_feed_rate); // void mc_line(double x, double y, double z, double feed_rate, int invert_feed_rate);
#define mc_line(x, y, z, feed_rate, invert_feed_rate) plan_buffer_line(x,y,z,feed_rate,invert_feed_rate)
// Note: Although this function structurally belongs in this module, there is nothing to to but
// to forward the request to the planner. For efficiency the function is replaced with a macro that
// just forwards the call to the planner.
// Execute an arc. theta == start angle, angular_travel == number of radians to go along the arc, // Execute an arc. theta == start angle, angular_travel == number of radians to go along the arc,
// positive angular_travel means clockwise, negative means counterclockwise. Radius == the radius of the // positive angular_travel means clockwise, negative means counterclockwise. Radius == the radius of the