Browse Source

Apply TERN

Scott Lahteine 5 years ago
parent
commit
e25402b541
2 changed files with 8 additions and 25 deletions
  1. 5
    16
      Marlin/src/module/planner.cpp
  2. 3
    9
      Marlin/src/module/planner.h

+ 5
- 16
Marlin/src/module/planner.cpp View File

135
 #if HAS_JUNCTION_DEVIATION
135
 #if HAS_JUNCTION_DEVIATION
136
   float Planner::junction_deviation_mm;       // (mm) M205 J
136
   float Planner::junction_deviation_mm;       // (mm) M205 J
137
   #if ENABLED(LIN_ADVANCE)
137
   #if ENABLED(LIN_ADVANCE)
138
-    #if ENABLED(DISTINCT_E_FACTORS)
139
-      float Planner::max_e_jerk[EXTRUDERS];   // Calculated from junction_deviation_mm
140
-    #else
141
-      float Planner::max_e_jerk;
142
-    #endif
138
+    float Planner::max_e_jerk               // Calculated from junction_deviation_mm
139
+      TERN_(DISTINCT_E_FACTORS, [EXTRUDERS]);
143
   #endif
140
   #endif
144
 #endif
141
 #endif
142
+
145
 #if HAS_CLASSIC_JERK
143
 #if HAS_CLASSIC_JERK
146
-  #if HAS_LINEAR_E_JERK
147
-    xyz_pos_t Planner::max_jerk;              // (mm/s^2) M205 XYZ - The largest speed change requiring no acceleration.
148
-  #else
149
-    xyze_pos_t Planner::max_jerk;             // (mm/s^2) M205 XYZE - The largest speed change requiring no acceleration.
150
-  #endif
144
+  TERN(HAS_LINEAR_E_JERK, xyz_pos_t, xyze_pos_t) Planner::max_jerk;
151
 #endif
145
 #endif
152
 
146
 
153
 #if ENABLED(SD_ABORT_ON_ENDSTOP_HIT)
147
 #if ENABLED(SD_ABORT_ON_ENDSTOP_HIT)
2382
     #endif
2376
     #endif
2383
 
2377
 
2384
     uint8_t limited = 0;
2378
     uint8_t limited = 0;
2385
-    #if HAS_LINEAR_E_JERK
2386
-      LOOP_XYZ(i)
2387
-    #else
2388
-      LOOP_XYZE(i)
2389
-    #endif
2390
-    {
2379
+    TERN(HAS_LINEAR_E_JERK, LOOP_XYZ, LOOP_XYZE)(i) {
2391
       const float jerk = ABS(current_speed[i]),   // cs : Starting from zero, change in speed for this axis
2380
       const float jerk = ABS(current_speed[i]),   // cs : Starting from zero, change in speed for this axis
2392
                   maxj = (max_jerk[i] + (i == X_AXIS || i == Y_AXIS ? extra_xyjerk : 0.0f)); // mj : The max jerk setting for this axis
2381
                   maxj = (max_jerk[i] + (i == X_AXIS || i == Y_AXIS ? extra_xyjerk : 0.0f)); // mj : The max jerk setting for this axis
2393
       if (jerk > maxj) {                          // cs > mj : New current speed too fast?
2382
       if (jerk > maxj) {                          // cs > mj : New current speed too fast?

+ 3
- 9
Marlin/src/module/planner.h View File

308
       static float junction_deviation_mm;       // (mm) M205 J
308
       static float junction_deviation_mm;       // (mm) M205 J
309
       #if ENABLED(LIN_ADVANCE)
309
       #if ENABLED(LIN_ADVANCE)
310
         static float max_e_jerk                 // Calculated from junction_deviation_mm
310
         static float max_e_jerk                 // Calculated from junction_deviation_mm
311
-          #if ENABLED(DISTINCT_E_FACTORS)
312
-            [EXTRUDERS]
313
-          #endif
314
-        ;
311
+          TERN_(DISTINCT_E_FACTORS, [EXTRUDERS]);
315
       #endif
312
       #endif
316
     #endif
313
     #endif
317
 
314
 
318
     #if HAS_CLASSIC_JERK
315
     #if HAS_CLASSIC_JERK
319
-      #if HAS_LINEAR_E_JERK
320
-        static xyz_pos_t max_jerk;              // (mm/s^2) M205 XYZ - The largest speed change requiring no acceleration.
321
-      #else
322
-        static xyze_pos_t max_jerk;             // (mm/s^2) M205 XYZE - The largest speed change requiring no acceleration.
323
-      #endif
316
+      // (mm/s^2) M205 XYZ(E) - The largest speed change requiring no acceleration.
317
+      static TERN(HAS_LINEAR_E_JERK, xyz_pos_t, xyze_pos_t) max_jerk;
324
     #endif
318
     #endif
325
 
319
 
326
     #if HAS_LEVELING
320
     #if HAS_LEVELING

Loading…
Cancel
Save