thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Define max_e_jerk as array always

Browse Source
This commit is contained in:
Scott Lahteine
2020-05-04 23:07:54 -05:00
parent 97e47b4494
commit 90e1035e9b
2 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Marlin/src/module/planner.h
View File

@@ -317,7 +317,7 @@ class Planner {
static float junction_deviation_mm; // (mm) M205 J
#if ENABLED(LIN_ADVANCE)
static float max_e_jerk // Calculated from junction_deviation_mm
TERN_(DISTINCT_E_FACTORS, [EXTRUDERS]);
[TERN(DISTINCT_E_FACTORS, EXTRUDERS, 1)];
#endif
#endif
@@ -840,13 +840,9 @@ class Planner {
#if HAS_LINEAR_E_JERK
FORCE_INLINE static void recalculate_max_e_jerk() {
#define GET_MAX_E_JERK(N) SQRT(junction_deviation_mm * (N) * SQRT(0.5) / (1.0f - SQRT(0.5)))
#if ENABLED(DISTINCT_E_FACTORS)
LOOP_L_N(i, EXTRUDERS)
max_e_jerk[i] = GET_MAX_E_JERK(settings.max_acceleration_mm_per_s2[E_AXIS_N(i)]);
#else
max_e_jerk = GET_MAX_E_JERK(settings.max_acceleration_mm_per_s2[E_AXIS]);
#endif
const float prop = junction_deviation_mm * SQRT(0.5) / (1.0f - SQRT(0.5));
LOOP_L_N(i, EXTRUDERS)
max_e_jerk[E_AXIS_N(i)] = SQRT(prop * settings.max_acceleration_mm_per_s2[E_AXIS_N(i)]);
}
#endif