Browse Source

Revert acceleration limiting to avoid overflow

Scott Lahteine 7 years ago
parent
commit
dc2cb8454c
1 changed files with 2 additions and 2 deletions
  1. 2
    2
      Marlin/planner.cpp

+ 2
- 2
Marlin/planner.cpp View File

1021
   }
1021
   }
1022
   else {
1022
   else {
1023
     #define LIMIT_ACCEL(AXIS) do{ \
1023
     #define LIMIT_ACCEL(AXIS) do{ \
1024
-      const uint32_t comp = max_acceleration_steps_per_s2[AXIS] * block->step_event_count; \
1025
-      if (accel * block->steps[AXIS] > comp) accel = comp / block->steps[AXIS]; \
1024
+      if (max_acceleration_steps_per_s2[AXIS] < (accel * block->steps[AXIS]) / block->step_event_count)
1025
+        accel = (max_acceleration_steps_per_s2[AXIS] * block->step_event_count) / block->steps[AXIS];
1026
     }while(0)
1026
     }while(0)
1027
 
1027
 
1028
     // Start with print or travel acceleration
1028
     // Start with print or travel acceleration

Loading…
Cancel
Save