Browse Source

Fixed planner bug

Erik van der Zalm 10 years ago
parent
commit
8349fc89a4
1 changed files with 3 additions and 3 deletions
  1. 3
    3
      Marlin/planner.cpp

+ 3
- 3
Marlin/planner.cpp View File

@@ -186,9 +186,9 @@ void calculate_trapezoid_for_block(block_t *block, float entry_factor, float exi
186 186
 
187 187
   long acceleration = block->acceleration_st;
188 188
   int32_t accelerate_steps =
189
-    ceil(estimate_acceleration_distance(block->initial_rate, block->nominal_rate, acceleration));
189
+    ceil(estimate_acceleration_distance(initial_rate, block->nominal_rate, acceleration));
190 190
   int32_t decelerate_steps =
191
-    floor(estimate_acceleration_distance(block->nominal_rate, block->final_rate, -acceleration));
191
+    floor(estimate_acceleration_distance(block->nominal_rate, final_rate, -acceleration));
192 192
 
193 193
   // Calculate the size of Plateau of Nominal Rate.
194 194
   int32_t plateau_steps = block->step_event_count-accelerate_steps-decelerate_steps;
@@ -197,7 +197,7 @@ void calculate_trapezoid_for_block(block_t *block, float entry_factor, float exi
197 197
   // have to use intersection_distance() to calculate when to abort acceleration and start braking
198 198
   // in order to reach the final_rate exactly at the end of this block.
199 199
   if (plateau_steps < 0) {
200
-    accelerate_steps = ceil(intersection_distance(block->initial_rate, block->final_rate, acceleration, block->step_event_count));
200
+    accelerate_steps = ceil(intersection_distance(initial_rate, final_rate, acceleration, block->step_event_count));
201 201
     accelerate_steps = max(accelerate_steps,0); // Check limits due to numerical round-off
202 202
     accelerate_steps = min((uint32_t)accelerate_steps,block->step_event_count);//(We can cast here to unsigned, because the above line ensures that we are above zero)
203 203
     plateau_steps = 0;

Loading…
Cancel
Save