CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buffer_line can calculate while it's waiting

Browse Source
This commit is contained in:
Scott Lahteine 2016-10-29 17:08:42 -05:00
parent 3c3fe1a1ba
commit c7f22f688f
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Marlin/planner.cpp
View File

@ -594,12 +594,6 @@ void Planner::check_axes_activity() {
* extruder - target extruder * extruder - target extruder
*/ */
void Planner::_buffer_line(const float &a, const float &b, const float &c, const float &e, float fr_mm_s, const uint8_t extruder) { void Planner::_buffer_line(const float &a, const float &b, const float &c, const float &e, float fr_mm_s, const uint8_t extruder) {
// Calculate the buffer head after we push this byte
int next_buffer_head = next_block_index(block_buffer_head);
// If the buffer is full: good! That means we are well ahead of the robot.
// Rest here until there is room in the buffer.
while (block_buffer_tail == next_buffer_head) idle();
// The target position of the tool in absolute steps // The target position of the tool in absolute steps
// Calculate target position in absolute steps // Calculate target position in absolute steps
@ -662,6 +656,13 @@ void Planner::_buffer_line(const float &a, const float &b, const float &c, const
} }
#endif #endif
// Calculate the buffer head after we push this byte
int next_buffer_head = next_block_index(block_buffer_head);
// If the buffer is full: good! That means we are well ahead of the robot.
// Rest here until there is room in the buffer.
while (block_buffer_tail == next_buffer_head) idle();
// Prepare to set up new block // Prepare to set up new block
block_t* block = &block_buffer[block_buffer_head]; block_t* block = &block_buffer[block_buffer_head];