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

Merge commit 'cd71a90ce8a770e0030ed6c9bac805b89724e275' into dev

Browse Source 
Conflicts:
	limits.c
	motion_control.c
	report.c
This commit is contained in:
Robert Grzesek
2014-02-18 18:23:39 -08:00
parent 3df61e0ec5 cd71a90ce8
commit 2307563d8a
8 changed files with 97 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
planner.c
View File

@ -259,7 +259,7 @@ uint8_t plan_check_full_buffer()
is used in three ways: as a normal feed rate if invert_feed_rate is false, as inverse time if
invert_feed_rate is true, or as seek/rapids rate if the feed_rate value is negative (and
invert_feed_rate always false). */
void plan_buffer_line(float *target, float feed_rate, uint8_t invert_feed_rate)
void plan_buffer_line(float *target, float feed_rate, uint8_t invert_feed_rate, uint32_t line_number)
{
// Prepare and initialize new block
plan_block_t *block = &block_buffer[block_buffer_head];
@ -267,7 +267,9 @@ void plan_buffer_line(float *target, float feed_rate, uint8_t invert_feed_rate)
block->millimeters = 0;
block->direction_bits = 0;
block->acceleration = SOME_LARGE_VALUE; // Scaled down to maximum acceleration later
#ifdef USE_LINE_NUMBERS
block->line_number = line_number;
#endif
// Compute and store initial move distance data.
// TODO: After this for-loop, we don't touch the stepper algorithm data. Might be a good idea
// to try to keep these types of things completely separate from the planner for portability.