From 4d5c655f8d6a8fe0d622047ed4cba5be109e037b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 26 Jun 2018 22:09:38 -0400
Subject: [PATCH] Make max_e_jerk an array to save CPU (#11121)
Co-Authored-By: gloomyandy <andy-git@gloomy-place.com>
---
Marlin/Marlin_main.cpp | 2 +-
Marlin/configuration_store.cpp | 2 +-
Marlin/planner.cpp | 15 +++++++++++++--
Marlin/planner.h | 16 +++++++++++++---
Marlin/ultralcd.cpp | 2 +-
5 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 7bd45c57a53..92ba3713e04 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -9174,7 +9174,7 @@ inline void gcode_M205() {
const float junc_dev = parser.value_linear_units();
if (WITHIN(junc_dev, 0.01, 0.3)) {
planner.junction_deviation_mm = junc_dev;
- planner.recalculate_max_e_jerk_factor();
+ planner.recalculate_max_e_jerk();
}
else {
SERIAL_ERROR_START();
diff --git a/Marlin/configuration_store.cpp b/Marlin/configuration_store.cpp
index c4c7509eaf5..835121c92d7 100644
--- a/Marlin/configuration_store.cpp
+++ b/Marlin/configuration_store.cpp
@@ -320,7 +320,7 @@ void MarlinSettings::postprocess() {
#endif
#if ENABLED(JUNCTION_DEVIATION) && ENABLED(LIN_ADVANCE)
- planner.recalculate_max_e_jerk_factor();
+ planner.recalculate_max_e_jerk();
#endif
// Refresh steps_to_mm with the reciprocal of axis_steps_per_mm
diff --git a/Marlin/planner.cpp b/Marlin/planner.cpp
index 6ae5da6d20a..4fce464099c 100644
--- a/Marlin/planner.cpp
+++ b/Marlin/planner.cpp
@@ -115,7 +115,11 @@ float Planner::max_feedrate_mm_s[XYZE_N], // (mm/s) M203 XYZE - Max speeds
#if ENABLED(JUNCTION_DEVIATION)
float Planner::junction_deviation_mm; // (mm) M205 J
#if ENABLED(LIN_ADVANCE)
- float Planner::max_e_jerk_factor; // Calculated from junction_deviation_mm
+ #if ENABLED(DISTINCT_E_FACTORS)
+ float Planner::max_e_jerk[EXTRUDERS]; // Calculated from junction_deviation_mm
+ #else
+ float Planner::max_e_jerk;
+ #endif
#endif
#else
float Planner::max_jerk[XYZE]; // (mm/s^2) M205 XYZE - The largest speed change requiring no acceleration.
@@ -2038,7 +2042,11 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
#if ENABLED(LIN_ADVANCE)
#if ENABLED(JUNCTION_DEVIATION)
- #define MAX_E_JERK (max_e_jerk_factor * max_acceleration_mm_per_s2[_EINDEX])
+ #if ENABLED(DISTINCT_E_FACTORS)
+ #define MAX_E_JERK max_e_jerk[extruder]
+ #else
+ #define MAX_E_JERK max_e_jerk
+ #endif
#else
#define MAX_E_JERK max_jerk[E_AXIS]
#endif
@@ -2551,6 +2559,9 @@ void Planner::reset_acceleration_rates() {
if (AXIS_CONDITION) NOLESS(highest_rate, max_acceleration_steps_per_s2[i]);
}
cutoff_long = 4294967295UL / highest_rate; // 0xFFFFFFFFUL
+ #if ENABLED(JUNCTION_DEVIATION) && ENABLED(LIN_ADVANCE)
+ recalculate_max_e_jerk();
+ #endif
}
// Recalculate position, steps_to_mm if axis_steps_per_mm changes!
diff --git a/Marlin/planner.h b/Marlin/planner.h
index 2f64e110fc9..8255bb13f96 100644
--- a/Marlin/planner.h
+++ b/Marlin/planner.h
@@ -205,7 +205,11 @@ class Planner {
#if ENABLED(JUNCTION_DEVIATION)
static float junction_deviation_mm; // (mm) M205 J
#if ENABLED(LIN_ADVANCE)
- static float max_e_jerk_factor; // Calculated from junction_deviation_mm
+ #if ENABLED(DISTINCT_E_FACTORS)
+ static float max_e_jerk[EXTRUDERS]; // Calculated from junction_deviation_mm
+ #else
+ static float max_e_jerk;
+ #endif
#endif
#else
static float max_jerk[XYZE]; // (mm/s^2) M205 XYZE - The largest speed change requiring no acceleration.
@@ -737,9 +741,15 @@ class Planner {
#endif
#if ENABLED(JUNCTION_DEVIATION)
- FORCE_INLINE static void recalculate_max_e_jerk_factor() {
+ FORCE_INLINE static void recalculate_max_e_jerk() {
+ #define GET_MAX_E_JERK(N) SQRT(SQRT(0.5) * junction_deviation_mm * (N) * RECIPROCAL(1.0 - SQRT(0.5)))
#if ENABLED(LIN_ADVANCE)
- max_e_jerk_factor = SQRT(SQRT(0.5) * junction_deviation_mm * RECIPROCAL(1.0 - SQRT(0.5)));
+ #if ENABLED(DISTINCT_E_FACTORS)
+ for (uint8_t i = 0; i < EXTRUDERS; i++)
+ max_e_jerk[i] = GET_MAX_E_JERK(max_acceleration_mm_per_s2[E_AXIS + i]);
+ #else
+ max_e_jerk = GET_MAX_E_JERK(max_acceleration_mm_per_s2[E_AXIS]);
+ #endif
#endif
}
#endif
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index c1819253486..ee2b7cd57a8 100644
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@@ -3741,7 +3741,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
MENU_BACK(MSG_MOTION);
#if ENABLED(JUNCTION_DEVIATION)
- MENU_ITEM_EDIT_CALLBACK(float43, MSG_JUNCTION_DEVIATION, &planner.junction_deviation_mm, 0.01, 0.3, planner.recalculate_max_e_jerk_factor);
+ MENU_ITEM_EDIT_CALLBACK(float43, MSG_JUNCTION_DEVIATION, &planner.junction_deviation_mm, 0.01, 0.3, planner.recalculate_max_e_jerk);
#else
MENU_MULTIPLIER_ITEM_EDIT(float3, MSG_VA_JERK, &planner.max_jerk[A_AXIS], 1, 990);
MENU_MULTIPLIER_ITEM_EDIT(float3, MSG_VB_JERK, &planner.max_jerk[B_AXIS], 1, 990);