Skip to content

Commit

Permalink
Merged 1.1.0-RC6 Version changes
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed Apr 25, 2016
2 parents 30c9893 + df2d0eb commit dee6322
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Marlin/planner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,8 @@ FORCE_INLINE float intersection_distance(float initial_rate, float final_rate, f
// Calculates trapezoid parameters so that the entry- and exit-speed is compensated by the provided factors.

void calculate_trapezoid_for_block(block_t* block, float entry_factor, float exit_factor) {
unsigned long initial_rate = ceil(block->nominal_rate * entry_factor); // (step/min)
unsigned long final_rate = ceil(block->nominal_rate * exit_factor); // (step/min)
unsigned long initial_rate = ceil(block->nominal_rate * entry_factor),
final_rate = ceil(block->nominal_rate * exit_factor); // (steps per second)

// Limit minimal step rate (Otherwise the timer will overflow.)
NOLESS(initial_rate, 120);
Expand Down

0 comments on commit dee6322

Please sign in to comment.