diff options
author | midopple <mdoppler@gmx.at> | 2012-03-12 20:04:13 +0100 |
---|---|---|
committer | midopple <mdoppler@gmx.at> | 2012-03-12 20:04:13 +0100 |
commit | 3116c11f5d352519bc82875161baf196055dc450 (patch) | |
tree | 94ef8b96f4abbaff05c082ec7e2616a1f7c76315 | |
parent | 7d93c079df1d3c760ec80f1c0811e94d8fe4160f (diff) |
calculate feedrate without extrude before planner block is set
-rw-r--r-- | Sprinter/Sprinter.pde | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Sprinter/Sprinter.pde b/Sprinter/Sprinter.pde index 06e37c4..5740712 100644 --- a/Sprinter/Sprinter.pde +++ b/Sprinter/Sprinter.pde @@ -2258,6 +2258,13 @@ void plan_buffer_line(float x, float y, float z, float e, float feed_rate) if(block->steps_z != 0) enable_z(); if(block->steps_e != 0) enable_e(); #endif + + if (block->steps_e == 0) { + if(feed_rate<mintravelfeedrate) feed_rate=mintravelfeedrate; + } + else { + if(feed_rate<minimumfeedrate) feed_rate=minimumfeedrate; + } // slow down when de buffer starts to empty, rather than wait at the corner for a buffer refill int moves_queued=(block_buffer_head-block_buffer_tail + BLOCK_BUFFER_SIZE) & (BLOCK_BUFFER_SIZE - 1); @@ -2288,14 +2295,7 @@ void plan_buffer_line(float x, float y, float z, float e, float feed_rate) - if (block->steps_e == 0) { - if(feed_rate<mintravelfeedrate) feed_rate=mintravelfeedrate; - } - else { - if(feed_rate<minimumfeedrate) feed_rate=minimumfeedrate; - } - - + /* // segment time im micro seconds long segment_time = lround(1000000.0/inverse_second); |