chiark / gitweb /
Fixed type in e-jerk
authorErik van der Zalm <erik@vdzalm.eu>
Sun, 4 Mar 2012 22:09:13 +0000 (23:09 +0100)
committerErik van der Zalm <erik@vdzalm.eu>
Sun, 4 Mar 2012 22:09:13 +0000 (23:09 +0100)
Marlin/planner.cpp

index 84c0daeff73eb2209e2dae9bbdadf86a1be6bfc0..fdc4a1f009eef527fb05e8d238d187ee5cd465b7 100644 (file)
@@ -708,7 +708,7 @@ void plan_buffer_line(const float &x, const float &y, const float &z, const floa
     vmax_junction = max_z_jerk/2;
   vmax_junction = min(vmax_junction, block->nominal_speed);
   if(abs(current_speed[E_AXIS]) > max_e_jerk/2) 
-    vmax_junction = min(vmax_junction, max_z_jerk/2);
+    vmax_junction = min(vmax_junction, max_e_jerk/2);
     
   if ((moves_queued > 1) && (previous_nominal_speed > 0.0)) {
     float jerk = sqrt(pow((current_speed[X_AXIS]-previous_speed[X_AXIS]), 2)+pow((current_speed[Y_AXIS]-previous_speed[Y_AXIS]), 2));