Merge commit 'cd71a90ce8a770e0030ed6c9bac805b89724e275' into dev

Conflicts:
	limits.c
	motion_control.c
	report.c
This commit is contained in:
Robert Grzesek
2014-02-18 18:23:39 -08:00
8 changed files with 97 additions and 68 deletions

View File

@ -22,18 +22,19 @@
#ifndef motion_control_h
#define motion_control_h
#define HOMING_CYCLE_LINE_NUMBER 1000000000
// 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 minute)/feed_rate time.
void mc_line(float *target, float feed_rate, uint8_t invert_feed_rate);
void mc_line(float *target, float feed_rate, uint8_t invert_feed_rate, uint32_t line_number);
// Execute an arc in offset mode format. position == current xyz, target == target xyz,
// offset == offset from current xyz, axis_XXX defines circle plane in tool space, axis_linear is
// the direction of helical travel, radius == circle radius, isclockwise boolean. Used
// for vector transformation direction.
void mc_arc(float *position, float *target, float *offset, uint8_t axis_0, uint8_t axis_1,
uint8_t axis_linear, float feed_rate, uint8_t invert_feed_rate, float radius, uint8_t isclockwise);
uint8_t axis_linear, float feed_rate, uint8_t invert_feed_rate, float radius, uint8_t isclockwise, uint32_t line_number);
// Dwell for a specific number of seconds
void mc_dwell(float seconds);