Browse Source

Syntax cleanup

Scott Lahteine 8 years ago
parent
commit
79d42d87c1
1 changed files with 9 additions and 8 deletions
  1. 9
    8
      Marlin/planner.cpp

+ 9
- 8
Marlin/planner.cpp View File

1141
 
1141
 
1142
     // Limit acceleration per axis
1142
     // Limit acceleration per axis
1143
     if (block->step_event_count <= cutoff_long) {
1143
     if (block->step_event_count <= cutoff_long) {
1144
-      LIMIT_ACCEL_LONG(X_AXIS,0);
1145
-      LIMIT_ACCEL_LONG(Y_AXIS,0);
1146
-      LIMIT_ACCEL_LONG(Z_AXIS,0);
1147
-      LIMIT_ACCEL_LONG(E_AXIS,ACCEL_IDX);
1144
+      LIMIT_ACCEL_LONG(X_AXIS, 0);
1145
+      LIMIT_ACCEL_LONG(Y_AXIS, 0);
1146
+      LIMIT_ACCEL_LONG(Z_AXIS, 0);
1147
+      LIMIT_ACCEL_LONG(E_AXIS, ACCEL_IDX);
1148
     }
1148
     }
1149
     else {
1149
     else {
1150
-      LIMIT_ACCEL_FLOAT(X_AXIS,0);
1151
-      LIMIT_ACCEL_FLOAT(Y_AXIS,0);
1152
-      LIMIT_ACCEL_FLOAT(Z_AXIS,0);
1153
-      LIMIT_ACCEL_FLOAT(E_AXIS,ACCEL_IDX);
1150
+      LIMIT_ACCEL_FLOAT(X_AXIS, 0);
1151
+      LIMIT_ACCEL_FLOAT(Y_AXIS, 0);
1152
+      LIMIT_ACCEL_FLOAT(Z_AXIS, 0);
1153
+      LIMIT_ACCEL_FLOAT(E_AXIS, ACCEL_IDX);
1154
     }
1154
     }
1155
   }
1155
   }
1156
   block->acceleration_steps_per_s2 = accel;
1156
   block->acceleration_steps_per_s2 = accel;
1256
         v_exit *= v_factor;
1256
         v_exit *= v_factor;
1257
         v_entry *= v_factor;
1257
         v_entry *= v_factor;
1258
       }
1258
       }
1259
+
1259
       // Calculate jerk depending on whether the axis is coasting in the same direction or reversing.
1260
       // Calculate jerk depending on whether the axis is coasting in the same direction or reversing.
1260
       const float jerk = (v_exit > v_entry)
1261
       const float jerk = (v_exit > v_entry)
1261
           ? //                                  coasting             axis reversal
1262
           ? //                                  coasting             axis reversal

Loading…
Cancel
Save