diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 0c968f6db580f6e8f9a777bd7428ce945b0840ea..2a111560029a237b3de5c5908eaafb85de33f43f 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -498,7 +498,8 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XYJERK 20.0
+#define DEFAULT_XJERK 20.0
+#define DEFAULT_YJERK 20.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_EJERK 5.0
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 1b3c0c21801a896864d916e16daf30e55277dc3e..e8c09fcbfc71db3add6d6f5f0df09a349342ae19 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -5548,11 +5548,11 @@ inline void gcode_M92() {
float value = code_value_per_axis_unit(i);
if (value < 20.0) {
float factor = planner.axis_steps_per_mm[i] / value; // increase e constants if M92 E14 is given for netfab.
- planner.max_e_jerk *= factor;
- planner.max_feedrate_mm_s[i] *= factor;
- planner.max_acceleration_steps_per_s2[i] *= factor;
+ planner.max_jerk[E_AXIS] *= factor;
+ planner.max_feedrate_mm_s[E_AXIS] *= factor;
+ planner.max_acceleration_steps_per_s2[E_AXIS] *= factor;
}
- planner.axis_steps_per_mm[i] = value;
+ planner.axis_steps_per_mm[E_AXIS] = value;
}
else {
planner.axis_steps_per_mm[i] = code_value_per_axis_unit(i);
@@ -5788,9 +5788,10 @@ inline void gcode_M205() {
if (code_seen('S')) planner.min_feedrate_mm_s = code_value_linear_units();
if (code_seen('T')) planner.min_travel_feedrate_mm_s = code_value_linear_units();
if (code_seen('B')) planner.min_segment_time = code_value_millis();
- if (code_seen('X')) planner.max_xy_jerk = code_value_linear_units();
- if (code_seen('Z')) planner.max_z_jerk = code_value_axis_units(Z_AXIS);
- if (code_seen('E')) planner.max_e_jerk = code_value_axis_units(E_AXIS);
+ if (code_seen('X')) planner.max_jerk[X_AXIS] = code_value_axis_units(X_AXIS);
+ if (code_seen('Y')) planner.max_jerk[Y_AXIS] = code_value_axis_units(Y_AXIS);
+ if (code_seen('Z')) planner.max_jerk[Z_AXIS] = code_value_axis_units(Z_AXIS);
+ if (code_seen('E')) planner.max_jerk[E_AXIS] = code_value_axis_units(E_AXIS);
}
/**
diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h
index b2c9bfc540b10c8efbe2006b8c491b9a67cb60a0..44950ffdf75ada99e4fd24daf27558dd70cd91e6 100644
--- a/Marlin/SanityCheck.h
+++ b/Marlin/SanityCheck.h
@@ -91,6 +91,8 @@
#error "SERVO_ENDSTOP_ANGLES is deprecated. Use Z_SERVO_ANGLES instead."
#elif defined(X_ENDSTOP_SERVO_NR) || defined(Y_ENDSTOP_SERVO_NR)
#error "X_ENDSTOP_SERVO_NR and Y_ENDSTOP_SERVO_NR are deprecated and should be removed."
+#elif defined(DEFAULT_XYJERK)
+ #error "DEFAULT_XYJERK is deprecated. Use DEFAULT_XJERK and DEFAULT_YJERK instead."
#elif defined(XY_TRAVEL_SPEED)
#error "XY_TRAVEL_SPEED is deprecated. Use XY_PROBE_SPEED instead."
#elif defined(PROBE_SERVO_DEACTIVATION_DELAY)
diff --git a/Marlin/configuration_store.cpp b/Marlin/configuration_store.cpp
index f6d061dcb69afc725108e8d57b561d6fbd952bb9..1891651f63c20505af8b5b9f1250156c394d80c5 100644
--- a/Marlin/configuration_store.cpp
+++ b/Marlin/configuration_store.cpp
@@ -36,7 +36,7 @@
*
*/
-#define EEPROM_VERSION "V25"
+#define EEPROM_VERSION "V26"
// Change EEPROM version if these are changed:
#define EEPROM_OFFSET 100
@@ -57,69 +57,70 @@
* 166 M205 S planner.min_feedrate_mm_s (float)
* 170 M205 T planner.min_travel_feedrate_mm_s (float)
* 174 M205 B planner.min_segment_time (ulong)
- * 178 M205 X planner.max_xy_jerk (float)
- * 182 M205 Z planner.max_z_jerk (float)
- * 186 M205 E planner.max_e_jerk (float)
- * 190 M206 XYZ home_offset (float x3)
+ * 178 M205 X planner.max_jerk[X_AXIS] (float)
+ * 182 M205 Y planner.max_jerk[Y_AXIS] (float)
+ * 186 M205 Z planner.max_jerk[Z_AXIS] (float)
+ * 190 M205 E planner.max_jerk[E_AXIS] (float)
+ * 194 M206 XYZ home_offset (float x3)
*
* Mesh bed leveling:
- * 202 M420 S status (uint8)
- * 203 z_offset (float)
- * 207 mesh_num_x (uint8 as set in firmware)
- * 208 mesh_num_y (uint8 as set in firmware)
- * 209 G29 S3 XYZ z_values[][] (float x9, by default, up to float x 81)
+ * 206 M420 S status (uint8)
+ * 207 z_offset (float)
+ * 211 mesh_num_x (uint8 as set in firmware)
+ * 212 mesh_num_y (uint8 as set in firmware)
+ * 213 G29 S3 XYZ z_values[][] (float x9, by default, up to float x 81)
*
* AUTO BED LEVELING
- * 245 M851 zprobe_zoffset (float)
+ * 249 M851 zprobe_zoffset (float)
*
* DELTA:
- * 249 M666 XYZ endstop_adj (float x3)
- * 261 M665 R delta_radius (float)
- * 265 M665 L delta_diagonal_rod (float)
- * 269 M665 S delta_segments_per_second (float)
- * 273 M665 A delta_diagonal_rod_trim_tower_1 (float)
- * 277 M665 B delta_diagonal_rod_trim_tower_2 (float)
- * 281 M665 C delta_diagonal_rod_trim_tower_3 (float)
+ * 253 M666 XYZ endstop_adj (float x3)
+ * 265 M665 R delta_radius (float)
+ * 269 M665 L delta_diagonal_rod (float)
+ * 273 M665 S delta_segments_per_second (float)
+ * 277 M665 A delta_diagonal_rod_trim_tower_1 (float)
+ * 281 M665 B delta_diagonal_rod_trim_tower_2 (float)
+ * 285 M665 C delta_diagonal_rod_trim_tower_3 (float)
*
* Z_DUAL_ENDSTOPS:
- * 285 M666 Z z_endstop_adj (float)
+ * 289 M666 Z z_endstop_adj (float)
*
* ULTIPANEL:
- * 289 M145 S0 H preheatHotendTemp1 (int)
- * 291 M145 S0 B preheatBedTemp1 (int)
- * 293 M145 S0 F preheatFanSpeed1 (int)
- * 295 M145 S1 H preheatHotendTemp2 (int)
- * 297 M145 S1 B preheatBedTemp2 (int)
- * 299 M145 S1 F preheatFanSpeed2 (int)
+ * 293 M145 S0 H preheatHotendTemp1 (int)
+ * 295 M145 S0 B preheatBedTemp1 (int)
+ * 297 M145 S0 F preheatFanSpeed1 (int)
+ * 299 M145 S1 H preheatHotendTemp2 (int)
+ * 301 M145 S1 B preheatBedTemp2 (int)
+ * 303 M145 S1 F preheatFanSpeed2 (int)
*
* PIDTEMP:
- * 301 M301 E0 PIDC Kp[0], Ki[0], Kd[0], Kc[0] (float x4)
- * 317 M301 E1 PIDC Kp[1], Ki[1], Kd[1], Kc[1] (float x4)
- * 333 M301 E2 PIDC Kp[2], Ki[2], Kd[2], Kc[2] (float x4)
- * 349 M301 E3 PIDC Kp[3], Ki[3], Kd[3], Kc[3] (float x4)
- * 365 M301 L lpq_len (int)
+ * 305 M301 E0 PIDC Kp[0], Ki[0], Kd[0], Kc[0] (float x4)
+ * 321 M301 E1 PIDC Kp[1], Ki[1], Kd[1], Kc[1] (float x4)
+ * 337 M301 E2 PIDC Kp[2], Ki[2], Kd[2], Kc[2] (float x4)
+ * 353 M301 E3 PIDC Kp[3], Ki[3], Kd[3], Kc[3] (float x4)
+ * 369 M301 L lpq_len (int)
*
* PIDTEMPBED:
- * 367 M304 PID thermalManager.bedKp, thermalManager.bedKi, thermalManager.bedKd (float x3)
+ * 371 M304 PID thermalManager.bedKp, thermalManager.bedKi, thermalManager.bedKd (float x3)
*
* DOGLCD:
- * 379 M250 C lcd_contrast (int)
+ * 383 M250 C lcd_contrast (int)
*
* FWRETRACT:
- * 381 M209 S autoretract_enabled (bool)
- * 382 M207 S retract_length (float)
- * 386 M207 W retract_length_swap (float)
- * 390 M207 F retract_feedrate_mm_s (float)
- * 394 M207 Z retract_zlift (float)
- * 398 M208 S retract_recover_length (float)
- * 402 M208 W retract_recover_length_swap (float)
- * 406 M208 F retract_recover_feedrate_mm_s (float)
+ * 385 M209 S autoretract_enabled (bool)
+ * 386 M207 S retract_length (float)
+ * 390 M207 W retract_length_swap (float)
+ * 394 M207 F retract_feedrate_mm_s (float)
+ * 399 M207 Z retract_zlift (float)
+ * 402 M208 S retract_recover_length (float)
+ * 406 M208 W retract_recover_length_swap (float)
+ * 410 M208 F retract_recover_feedrate_mm_s (float)
*
* Volumetric Extrusion:
- * 410 M200 D volumetric_enabled (bool)
- * 411 M200 T D filament_size (float x4) (T0..3)
+ * 414 M200 D volumetric_enabled (bool)
+ * 415 M200 T D filament_size (float x4) (T0..3)
*
- * 427 This Slot is Available!
+ * 431 This Slot is Available!
*
*/
#include "Marlin.h"
@@ -219,9 +220,7 @@ void Config_StoreSettings() {
EEPROM_WRITE(planner.min_feedrate_mm_s);
EEPROM_WRITE(planner.min_travel_feedrate_mm_s);
EEPROM_WRITE(planner.min_segment_time);
- EEPROM_WRITE(planner.max_xy_jerk);
- EEPROM_WRITE(planner.max_z_jerk);
- EEPROM_WRITE(planner.max_e_jerk);
+ EEPROM_WRITE(planner.max_jerk);
EEPROM_WRITE(home_offset);
#if ENABLED(MESH_BED_LEVELING)
@@ -405,9 +404,7 @@ void Config_RetrieveSettings() {
EEPROM_READ(planner.min_feedrate_mm_s);
EEPROM_READ(planner.min_travel_feedrate_mm_s);
EEPROM_READ(planner.min_segment_time);
- EEPROM_READ(planner.max_xy_jerk);
- EEPROM_READ(planner.max_z_jerk);
- EEPROM_READ(planner.max_e_jerk);
+ EEPROM_READ(planner.max_jerk);
EEPROM_READ(home_offset);
uint8_t dummy_uint8 = 0, mesh_num_x = 0, mesh_num_y = 0;
@@ -576,9 +573,10 @@ void Config_ResetDefault() {
planner.min_feedrate_mm_s = DEFAULT_MINIMUMFEEDRATE;
planner.min_segment_time = DEFAULT_MINSEGMENTTIME;
planner.min_travel_feedrate_mm_s = DEFAULT_MINTRAVELFEEDRATE;
- planner.max_xy_jerk = DEFAULT_XYJERK;
- planner.max_z_jerk = DEFAULT_ZJERK;
- planner.max_e_jerk = DEFAULT_EJERK;
+ planner.max_jerk[X_AXIS] = DEFAULT_XJERK;
+ planner.max_jerk[Y_AXIS] = DEFAULT_YJERK;
+ planner.max_jerk[Z_AXIS] = DEFAULT_ZJERK;
+ planner.max_jerk[E_AXIS] = DEFAULT_EJERK;
home_offset[X_AXIS] = home_offset[Y_AXIS] = home_offset[Z_AXIS] = 0;
#if ENABLED(MESH_BED_LEVELING)
@@ -734,9 +732,10 @@ void Config_PrintSettings(bool forReplay) {
SERIAL_ECHOPAIR(" M205 S", planner.min_feedrate_mm_s);
SERIAL_ECHOPAIR(" T", planner.min_travel_feedrate_mm_s);
SERIAL_ECHOPAIR(" B", planner.min_segment_time);
- SERIAL_ECHOPAIR(" X", planner.max_xy_jerk);
- SERIAL_ECHOPAIR(" Z", planner.max_z_jerk);
- SERIAL_ECHOPAIR(" E", planner.max_e_jerk);
+ SERIAL_ECHOPAIR(" X", planner.max_jerk[X_AXIS]);
+ SERIAL_ECHOPAIR(" Y", planner.max_jerk[Y_AXIS]);
+ SERIAL_ECHOPAIR(" Z", planner.max_jerk[Z_AXIS]);
+ SERIAL_ECHOPAIR(" E", planner.max_jerk[E_AXIS]);
SERIAL_EOL;
CONFIG_ECHO_START;
diff --git a/Marlin/example_configurations/Cartesio/Configuration.h b/Marlin/example_configurations/Cartesio/Configuration.h
index 883cdc7848b96cce0ba320a3cf3726b83833e318..318e15d3fde32a45987cb0473b581d9f427909fc 100644
--- a/Marlin/example_configurations/Cartesio/Configuration.h
+++ b/Marlin/example_configurations/Cartesio/Configuration.h
@@ -498,7 +498,8 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XYJERK 10.0
+#define DEFAULT_XJERK 10.0
+#define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_EJERK 5.0
diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h
index 2ef68d97c5dcfc90a604edbab4d54336e8c7ec88..d5940affdbd27306c88d114aa1aa64127778c11c 100644
--- a/Marlin/example_configurations/Felix/Configuration.h
+++ b/Marlin/example_configurations/Felix/Configuration.h
@@ -481,7 +481,8 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XYJERK 10.0
+#define DEFAULT_XJERK 10.0
+#define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.3
#define DEFAULT_EJERK 5.0
diff --git a/Marlin/example_configurations/Felix/DUAL/Configuration.h b/Marlin/example_configurations/Felix/DUAL/Configuration.h
index 0b5facb6882b10ffedc757d39891e09dd2cb0be6..6f39cf5d72615ad58707de24ea9b982c10ac13e9 100644
--- a/Marlin/example_configurations/Felix/DUAL/Configuration.h
+++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h
@@ -481,7 +481,8 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XYJERK 10.0
+#define DEFAULT_XJERK 10.0
+#define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.3
#define DEFAULT_EJERK 5.0
diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h
index ad5c8201fd5dad1da549217476284840414bc635..d461704d68122d38cab8d0ea7f48e4832243df8d 100644
--- a/Marlin/example_configurations/Hephestos/Configuration.h
+++ b/Marlin/example_configurations/Hephestos/Configuration.h
@@ -490,7 +490,8 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XYJERK 10.0
+#define DEFAULT_XJERK 10.0
+#define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_EJERK 5.0
diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/Hephestos_2/Configuration.h
index 3eb08e2ba17eb5a7b244b090e80f71719582c3c6..945425eb11e598b3c256e7cfb607444e0c24a3a8 100644
--- a/Marlin/example_configurations/Hephestos_2/Configuration.h
+++ b/Marlin/example_configurations/Hephestos_2/Configuration.h
@@ -492,7 +492,8 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XYJERK 20.0
+#define DEFAULT_XJERK 20.0
+#define DEFAULT_YJERK 20.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_EJERK 2.0
diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h
index 5c5c3ec30f88b69f794f3800714ac047eba06c2a..f9c1aad8d3d58ab95b2ac3e1b986e5b3e3ae9709 100644
--- a/Marlin/example_configurations/K8200/Configuration.h
+++ b/Marlin/example_configurations/K8200/Configuration.h
@@ -515,7 +515,8 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XYJERK 20.0
+#define DEFAULT_XJERK 20.0
+#define DEFAULT_YJERK 20.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_EJERK 5.0
diff --git a/Marlin/example_configurations/K8400/Configuration.h b/Marlin/example_configurations/K8400/Configuration.h
index d3d9d5f5b1a11a04337a9d796f29f6f8be5d9111..93693baaf361401a32a894e5060f233c98a00150 100644
--- a/Marlin/example_configurations/K8400/Configuration.h
+++ b/Marlin/example_configurations/K8400/Configuration.h
@@ -498,7 +498,8 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XYJERK 10.0
+#define DEFAULT_XJERK 10.0
+#define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.5
#define DEFAULT_EJERK 20.0
diff --git a/Marlin/example_configurations/K8400/Dual-head/Configuration.h b/Marlin/example_configurations/K8400/Dual-head/Configuration.h
index 097d1775fa3bcf99c1f05c5d531d4abe74d6d2b5..138651faf0646d877d4485234c591c7472fdad1f 100644
--- a/Marlin/example_configurations/K8400/Dual-head/Configuration.h
+++ b/Marlin/example_configurations/K8400/Dual-head/Configuration.h
@@ -498,7 +498,8 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XYJERK 10.0
+#define DEFAULT_XJERK 10.0
+#define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.5
#define DEFAULT_EJERK 20.0
diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
index 289a672cb08c257864b2fcad10c8fc29d741f835..b08323e6b4100994f3536775d7cc707019b4bc44 100644
--- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
+++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
@@ -498,7 +498,8 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XYJERK 20.0
+#define DEFAULT_XJERK 20.0
+#define DEFAULT_YJERK 20.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_EJERK 5.0
diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h
index 400caaf96929d6d7e59b766cf6a973efc3445f4a..419e1abf94cb9e6f6280e0cb5560353f61bfa2f7 100644
--- a/Marlin/example_configurations/RigidBot/Configuration.h
+++ b/Marlin/example_configurations/RigidBot/Configuration.h
@@ -496,7 +496,8 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XYJERK 8.0
+#define DEFAULT_XJERK 8.0
+#define DEFAULT_YJERK 8.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_EJERK 5.0
diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h
index a9eb8b51e4f0031a614b00795f369830ac0cc077..9768a23097c4ef64274473c8511bfeefba2b36dc 100644
--- a/Marlin/example_configurations/SCARA/Configuration.h
+++ b/Marlin/example_configurations/SCARA/Configuration.h
@@ -513,7 +513,8 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XYJERK 5.0
+#define DEFAULT_XJERK 5.0
+#define DEFAULT_YJERK 5.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_EJERK 3.0
diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h
index 3d60ca6797aae8b92e71aadbdf3263cc0d1db97e..9ec1e6e372b757033391979736cf6cd2f35face6 100644
--- a/Marlin/example_configurations/TAZ4/Configuration.h
+++ b/Marlin/example_configurations/TAZ4/Configuration.h
@@ -519,7 +519,8 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XYJERK 8.0
+#define DEFAULT_XJERK 8.0
+#define DEFAULT_YJERK 8.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_EJERK 10.0
diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h
index be796c38ac698f0c0fee95f63c7c088180975e7e..9c9a0aa8f4f57bd8959e311dff69b609e01c1ccb 100644
--- a/Marlin/example_configurations/WITBOX/Configuration.h
+++ b/Marlin/example_configurations/WITBOX/Configuration.h
@@ -490,7 +490,8 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XYJERK 10.0
+#define DEFAULT_XJERK 10.0
+#define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_EJERK 5.0
diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h
index 6485659c5955baa80f70fd881acdae627805746e..d7e4535b5ee295c4ee78513357536f6aa0c15f51 100644
--- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h
+++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h
@@ -498,7 +498,8 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XYJERK 20.0
+#define DEFAULT_XJERK 20.0
+#define DEFAULT_YJERK 20.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_EJERK 5.0
diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h
index 154fa773b6fe46cc104fa2a6df369d5202f64cf7..e6bd25c278969e8ef6312979ed2252f9f59e3ab2 100644
--- a/Marlin/example_configurations/delta/biv2.5/Configuration.h
+++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h
@@ -541,7 +541,8 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XYJERK 15.0
+#define DEFAULT_XJERK 15.0
+#define DEFAULT_YJERK 15.0
#define DEFAULT_ZJERK 15.0 // Must be same as XY for delta
#define DEFAULT_EJERK 5.0
diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h
index 8c786f4c5277b1d63665a2127971a6cca203a045..0bafa2b572553e89ba0a6c90e24d565cda88b790 100644
--- a/Marlin/example_configurations/delta/generic/Configuration.h
+++ b/Marlin/example_configurations/delta/generic/Configuration.h
@@ -541,7 +541,8 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XYJERK 20.0
+#define DEFAULT_XJERK 20.0
+#define DEFAULT_YJERK 20.0
#define DEFAULT_ZJERK 20.0 // Must be same as XY for delta
#define DEFAULT_EJERK 5.0
diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h
index b34025fd54b8cba1fb783c8b912cb4f1d8487196..1994e90202e46ba7daa8de5d48d06fd9a0f499ba 100644
--- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h
@@ -541,7 +541,8 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XYJERK 20.0
+#define DEFAULT_XJERK 20.0
+#define DEFAULT_YJERK 20.0
#define DEFAULT_ZJERK 20.0 // Must be same as XY for delta
#define DEFAULT_EJERK 5.0
diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h
index 72b832c5433635ea544f38c6e2e4eb09c2b3c1bb..5ce3bb4d084f3664e5b1b8ae20c42fc6fbde20a1 100644
--- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h
@@ -537,7 +537,8 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XYJERK 20.0
+#define DEFAULT_XJERK 20.0
+#define DEFAULT_YJERK 20.0
#define DEFAULT_ZJERK 20.0 // Must be same as XY for delta
#define DEFAULT_EJERK 5.0
diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h
index 77091bb2c80a02df196a904549ba618dc149b356..27f2a968d9747af9c8dce3c33adaa078d22fe15d 100644
--- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h
@@ -547,7 +547,8 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XYJERK 20.0
+#define DEFAULT_XJERK 20.0
+#define DEFAULT_YJERK 20.0
#define DEFAULT_ZJERK 20.0
#define DEFAULT_EJERK 20.0
diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h
index f03067f4dd557ed46da84ad3b58e965d26cb9813..8c202ae8ee4aa0d74751fce6df24a641302a5f64 100644
--- a/Marlin/example_configurations/makibox/Configuration.h
+++ b/Marlin/example_configurations/makibox/Configuration.h
@@ -501,7 +501,8 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XYJERK 20.0
+#define DEFAULT_XJERK 20.0
+#define DEFAULT_YJERK 20.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_EJERK 5.0
diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h
index 4c90e6688b18d73c71c696e42272d1b2d7aa7727..e356a50dadf4501c70be707c25bc0eb8ae490d8d 100644
--- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h
+++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h
@@ -494,7 +494,8 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XYJERK 20.0
+#define DEFAULT_XJERK 20.0
+#define DEFAULT_YJERK 20.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_EJERK 5.0
diff --git a/Marlin/language_an.h b/Marlin/language_an.h
index 9184d332f92c078b61c259c26d4caa71e9f0aea2..8d6ccd9448c1b37cca9074c959356cf226a20e1c 100644
--- a/Marlin/language_an.h
+++ b/Marlin/language_an.h
@@ -86,7 +86,8 @@
#define MSG_PID_D "PID-D"
#define MSG_PID_C "PID-C"
#define MSG_ACC "Acel"
-#define MSG_VXY_JERK "Vxy-jerk"
+#define MSG_VX_JERK "Vx-jerk"
+#define MSG_VY_JERK "Vy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
#define MSG_VE_JERK "Ves-jerk"
#define MSG_VMAX "Vmax"
diff --git a/Marlin/language_bg.h b/Marlin/language_bg.h
index 5d5d3222c73d66662244e63a90baf1c6487da3f8..094aed0d3d259028b5cd26a0a70f87bc7a71f363 100644
--- a/Marlin/language_bg.h
+++ b/Marlin/language_bg.h
@@ -88,7 +88,8 @@
#define MSG_PID_D "PID-D"
#define MSG_PID_C "PID-C"
#define MSG_ACC "Acc"
-#define MSG_VXY_JERK "Vxy-jerk"
+#define MSG_VX_JERK "Vx-jerk"
+#define MSG_VY_JERK "Vy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
#define MSG_VE_JERK "Ve-jerk"
#define MSG_VMAX "Vmax "
diff --git a/Marlin/language_ca.h b/Marlin/language_ca.h
index efa296f9b3bfa0c1020cc6660ba87d08065d8bc0..8bb97060a32934d1e8ba3ce006a6d42f63989bc7 100644
--- a/Marlin/language_ca.h
+++ b/Marlin/language_ca.h
@@ -87,7 +87,8 @@
#define MSG_PID_D "PID-D"
#define MSG_PID_C "PID-C"
#define MSG_ACC "Accel"
-#define MSG_VXY_JERK "Vxy-jerk"
+#define MSG_VX_JERK "Vx-jerk"
+#define MSG_VY_JERK "Vy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
#define MSG_VE_JERK "Ve-jerk"
#define MSG_VMAX "Vmax "
diff --git a/Marlin/language_cn.h b/Marlin/language_cn.h
index 9afc052d7af27454c953c660318f305fb4a3a43d..1a1f81313ea9e5a6873f14d0dcc2eb6a80a773ff 100644
--- a/Marlin/language_cn.h
+++ b/Marlin/language_cn.h
@@ -86,7 +86,8 @@
#define MSG_PID_D "PID-D"
#define MSG_PID_C "PID-C"
#define MSG_ACC "Accel"
-#define MSG_VXY_JERK "Vxy-jerk"
+#define MSG_VX_JERK "Vx-jerk"
+#define MSG_VY_JERK "Vy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
#define MSG_VE_JERK "Ve-jerk"
#define MSG_VMAX "Vmax "
diff --git a/Marlin/language_cz.h b/Marlin/language_cz.h
index 89158e7e4909bfe40974b71df4cdec5092b4c3ec..7a441a429221692d00ef4832d0179a812eff9fb1 100644
--- a/Marlin/language_cz.h
+++ b/Marlin/language_cz.h
@@ -98,7 +98,8 @@
#define MSG_PID_C "PID-C"
#define MSG_SELECT "Vybrat"
#define MSG_ACC "Zrychl"
-#define MSG_VXY_JERK "Vxy-jerk"
+#define MSG_VX_JERK "Vx-jerk"
+#define MSG_VY_JERK "Vy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
#define MSG_VE_JERK "Ve-jerk"
#define MSG_VMAX "Vmax "
diff --git a/Marlin/language_da.h b/Marlin/language_da.h
index 2cf28dec400c5353c784d4ee9b50c8d481401bbd..8c770920d33f148ee7b2b857b4fa7df8786d5553 100644
--- a/Marlin/language_da.h
+++ b/Marlin/language_da.h
@@ -96,7 +96,8 @@
#define MSG_PID_C "PID-C"
#define MSG_SELECT "Vælg"
#define MSG_ACC "Accel"
-#define MSG_VXY_JERK "Vxy-jerk"
+#define MSG_VX_JERK "Vx-jerk"
+#define MSG_VY_JERK "Vy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
#define MSG_VE_JERK "Ve-jerk"
#define MSG_VMAX "Vmax "
diff --git a/Marlin/language_de.h b/Marlin/language_de.h
index f291a5d2acec838ce0d8018fc82be1bf09917559..2bc8a8d471709de94ef93128238fc5ec4693f51f 100644
--- a/Marlin/language_de.h
+++ b/Marlin/language_de.h
@@ -95,9 +95,10 @@
#define MSG_PID_C "PID C"
#define MSG_SELECT "Auswählen"
#define MSG_ACC "A"
-#define MSG_VXY_JERK "V XY Jerk"
-#define MSG_VZ_JERK "V Z Jerk"
-#define MSG_VE_JERK "V E Jerk"
+#define MSG_VX_JERK "V X Jerk"
+#define MSG_VY_JERK "V Y Jerk"
+#define MSG_VZ_JERK "V Z Jerk"
+#define MSG_VE_JERK "V E Jerk"
#define MSG_VMAX "V max " // space by purpose
#define MSG_VMIN "V min"
#define MSG_VTRAV_MIN "V min Leerfahrt"
diff --git a/Marlin/language_el-gr.h b/Marlin/language_el-gr.h
index 1c184966907ab2a5f08858e05cb953f68b958a7a..0ac443f55d85290d19a105fedfa05ce9f885e039 100644
--- a/Marlin/language_el-gr.h
+++ b/Marlin/language_el-gr.h
@@ -94,7 +94,8 @@
#define MSG_PID_D "PID-D"
#define MSG_PID_C "PID-C"
#define MSG_ACC "Επιτάχυνση"
-#define MSG_VXY_JERK "Vαντίδραση xy"
+#define MSG_VX_JERK "Vαντίδραση x"
+#define MSG_VY_JERK "Vαντίδραση y"
#define MSG_VZ_JERK "Vαντίδραση z"
#define MSG_VE_JERK "Vαντίδραση e"
#define MSG_VMAX "Vμεγ "
diff --git a/Marlin/language_el.h b/Marlin/language_el.h
index 4242969797b85a6743c30f122a62c7c3e5fcf299..03b45c3e2cebc638b5bdd59922f28daa49a61ffd 100644
--- a/Marlin/language_el.h
+++ b/Marlin/language_el.h
@@ -94,7 +94,8 @@
#define MSG_PID_D "PID-D"
#define MSG_PID_C "PID-C"
#define MSG_ACC "Επιτάχυνση"
-#define MSG_VXY_JERK "Vαντίδραση xy"
+#define MSG_VX_JERK "Vαντίδραση x"
+#define MSG_VY_JERK "Vαντίδραση y"
#define MSG_VZ_JERK "Vαντίδραση z"
#define MSG_VE_JERK "Vαντίδραση e"
#define MSG_VMAX "V Μέγιστο"
diff --git a/Marlin/language_en.h b/Marlin/language_en.h
index ca2fd611786cc13d8bfccce1cef96760150bf58f..aa11a132531fce8da2298158a83c1f935f2ad7bc 100644
--- a/Marlin/language_en.h
+++ b/Marlin/language_en.h
@@ -216,8 +216,11 @@
#ifndef MSG_ACC
#define MSG_ACC "Accel"
#endif
-#ifndef MSG_VXY_JERK
- #define MSG_VXY_JERK "Vxy-jerk"
+#ifndef MSG_VX_JERK
+ #define MSG_VX_JERK "Vx-jerk"
+#endif
+#ifndef MSG_VY_JERK
+ #define MSG_VY_JERK "Vy-jerk"
#endif
#ifndef MSG_VZ_JERK
#define MSG_VZ_JERK "Vz-jerk"
diff --git a/Marlin/language_es.h b/Marlin/language_es.h
index 06d79f707636566b8b21b2b158980b6a51430500..236842d759ab0797b769ba89544caea3139abfa0 100644
--- a/Marlin/language_es.h
+++ b/Marlin/language_es.h
@@ -92,7 +92,8 @@
#define MSG_PID_D "PID-D"
#define MSG_PID_C "PID-C"
#define MSG_ACC "Aceleracion"
-#define MSG_VXY_JERK "Vxy-jerk"
+#define MSG_VX_JERK "Vx-jerk"
+#define MSG_VY_JERK "Vy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
#define MSG_VE_JERK "Ve-jerk"
#define MSG_VMAX "Vmax"
diff --git a/Marlin/language_eu.h b/Marlin/language_eu.h
index 64c3fb32aeaec9e6659a9b837ba888260178668a..0d663597f3ca4805a0be21456a1b7de802d9cd80 100644
--- a/Marlin/language_eu.h
+++ b/Marlin/language_eu.h
@@ -86,7 +86,8 @@
#define MSG_PID_D "PID-D"
#define MSG_PID_C "PID-C"
#define MSG_ACC "Azelerazioa"
-#define MSG_VXY_JERK "Vxy-astindua"
+#define MSG_VX_JERK "Vx-astindua"
+#define MSG_VY_JERK "Vy-astindua"
#define MSG_VZ_JERK "Vz-astindua"
#define MSG_VE_JERK "Ve-astindua"
#define MSG_VMAX "Vmax "
diff --git a/Marlin/language_fi.h b/Marlin/language_fi.h
index 461bb413ca60dea5065db9c85047f9a3e453fee3..e7db9a2d9b65a5ef289f721a46da6ff989a18b37 100644
--- a/Marlin/language_fi.h
+++ b/Marlin/language_fi.h
@@ -87,7 +87,8 @@
#define MSG_PID_D "PID-D"
#define MSG_PID_C "PID-C"
#define MSG_ACC "Kiihtyv"
-#define MSG_VXY_JERK "Vxy-jerk"
+#define MSG_VX_JERK "Vx-jerk"
+#define MSG_VY_JERK "Vy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
#define MSG_VE_JERK "Ve-jerk"
#define MSG_VMAX "Vmax "
diff --git a/Marlin/language_fr.h b/Marlin/language_fr.h
index 34bd3836472a3469693231b985850f3331f42eb2..8a947dabbe79f5cb7455060d75361c298812f723 100644
--- a/Marlin/language_fr.h
+++ b/Marlin/language_fr.h
@@ -94,7 +94,8 @@
#define MSG_PID_C "PID-C"
#define MSG_SELECT "Selectionner"
#define MSG_ACC "Acceleration"
-#define MSG_VXY_JERK "Vxy-jerk"
+#define MSG_VX_JERK "Vx-jerk"
+#define MSG_VY_JERK "Vy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
#define MSG_VE_JERK "Ve-jerk"
#define MSG_VMAX "Vmax"
diff --git a/Marlin/language_gl.h b/Marlin/language_gl.h
index 5f1b591e9c911b84ee3003856640b2b577956cf0..19b028b6d6df1dacd84e1c42952092477cfbc4dd 100644
--- a/Marlin/language_gl.h
+++ b/Marlin/language_gl.h
@@ -95,7 +95,8 @@
#define MSG_PID_C "PID-C"
#define MSG_SELECT "Escolla"
#define MSG_ACC "Acel"
-#define MSG_VXY_JERK "Vxy-jerk"
+#define MSG_VX_JERK "Vx-jerk"
+#define MSG_VY_JERK "Vy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
#define MSG_VE_JERK "Ve-jerk"
#define MSG_VMAX "Vmax "
diff --git a/Marlin/language_hr.h b/Marlin/language_hr.h
index ebfaeb2fbd85a2c186189545afd491e4debc71cd..d23e18e855e0ed079d5adf35c246fd2d31cfaaea 100644
--- a/Marlin/language_hr.h
+++ b/Marlin/language_hr.h
@@ -93,7 +93,8 @@
#define MSG_PID_D "PID-D"
#define MSG_PID_C "PID-C"
#define MSG_ACC "Accel"
-#define MSG_VXY_JERK "Vxy-jerk"
+#define MSG_VX_JERK "Vx-jerk"
+#define MSG_VY_JERK "Vy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
#define MSG_VE_JERK "Ve-jerk"
#define MSG_VMAX "Vmax "
diff --git a/Marlin/language_it.h b/Marlin/language_it.h
index e3a253c86b2a8db2b79851a6604b84d010fa9c64..75df0efde082bfbf2c538b57a57fd5c1e7ce8ed4 100644
--- a/Marlin/language_it.h
+++ b/Marlin/language_it.h
@@ -102,7 +102,8 @@
#define MSG_PID_C "PID-C"
#define MSG_SELECT "Seleziona"
#define MSG_ACC "Accel"
-#define MSG_VXY_JERK "Vxy-jerk"
+#define MSG_VX_JERK "Vx-jerk"
+#define MSG_VY_JERK "Vy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
#define MSG_VE_JERK "Ve-jerk"
#define MSG_VMAX "Vmax "
diff --git a/Marlin/language_kana.h b/Marlin/language_kana.h
index f4e1458524a1f04ac1999de024567ec0428e5cf7..add301b9796548f320ca299a53f1622e748c66f9 100644
--- a/Marlin/language_kana.h
+++ b/Marlin/language_kana.h
@@ -103,7 +103,8 @@
#define MSG_SELECT "\xbe\xdd\xc0\xb8" // "ｾﾝﾀｸ" ("Select")
#if LCD_WIDTH > 19
#define MSG_ACC "\xb6\xbf\xb8\xc4\xde mm/s2" // "ｶｿｸﾄﾞ mm/s2" ("Accel")
- #define MSG_VXY_JERK "XY\xbc\xde\xb8\x20\xd4\xb8\xc4\xde mm/s" // "XYｼﾞｸ ﾔｸﾄﾞ mm/s" ("Vxy-jerk")
+ #define MSG_VX_JERK "X\xbc\xde\xb8\x20\xd4\xb8\xc4\xde mm/s" // "XYｼﾞｸ ﾔｸﾄﾞ mm/s" ("Vx-jerk")
+ #define MSG_VY_JERK "Y\xbc\xde\xb8\x20\xd4\xb8\xc4\xde mm/s" // "XYｼﾞｸ ﾔｸﾄﾞ mm/s" ("Vy-jerk")
#define MSG_VZ_JERK "Z\xbc\xde\xb8\x20\xd4\xb8\xc4\xde mm/s" // "Zｼﾞｸ ﾔｸﾄﾞ mm/s" ("Vz-jerk")
#define MSG_VE_JERK "\xb4\xb8\xbd\xc4\xd9\xb0\xc0\xde\xb0\x20\xd4\xb8\xc4\xde" // "ｴｸｽﾄﾙｰﾀﾞｰ ﾔｸﾄﾞ" ("Ve-jerk")
#define MSG_VMAX "\xbb\xb2\xc0\xde\xb2\xb5\xb8\xd8\xbf\xb8\xc4\xde " // "ｻｲﾀﾞｲｵｸﾘｿｸﾄﾞ " ("Vmax ")
@@ -112,7 +113,8 @@
#define MSG_AMAX "\xbb\xb2\xc0\xde\xb2\xb6\xbf\xb8\xc4\xde " // "ｻｲﾀﾞｲｶｿｸﾄﾞ " ("Amax ")
#else
#define MSG_ACC "\xb6\xbf\xb8\xc4\xde" // "ｶｿｸﾄﾞ" ("Accel")
- #define MSG_VXY_JERK "XY\xbc\xde\xb8\x20\xd4\xb8\xc4\xde" // "XYｼﾞｸ ﾔｸﾄﾞ" ("Vxy-jerk")
+ #define MSG_VX_JERK "X\xbc\xde\xb8\x20\xd4\xb8\xc4\xde" // "XYｼﾞｸ ﾔｸﾄﾞ" ("Vx-jerk")
+ #define MSG_VY_JERK "Y\xbc\xde\xb8\x20\xd4\xb8\xc4\xde" // "XYｼﾞｸ ﾔｸﾄﾞ" ("Vy-jerk")
#define MSG_VZ_JERK "Z\xbc\xde\xb8\x20\xd4\xb8\xc4\xde" // "Zｼﾞｸ ﾔｸﾄﾞ" ("Vz-jerk")
#define MSG_VE_JERK "E\x20\xd4\xb8\xc4\xde" // "E ﾔｸﾄﾞ" ("Ve-jerk")
#define MSG_VMAX "max\xb5\xb8\xd8\xbf\xb8\xc4\xde " // "maxｵｸﾘｿｸﾄﾞ" ("Vmax ")
diff --git a/Marlin/language_kana_utf8.h b/Marlin/language_kana_utf8.h
index 905df7142778f44c415bb9c33dd78f849b0531f5..15712fd8c1055fc862ebd69f2221a773042fe9ee 100644
--- a/Marlin/language_kana_utf8.h
+++ b/Marlin/language_kana_utf8.h
@@ -100,7 +100,8 @@
#define MSG_PID_C "PID-C"
#define MSG_SELECT "センタク" // "Select"
#define MSG_ACC "カソクド mm/s2" // "Accel"
-#define MSG_VXY_JERK "XYジク ヤクド mm/s" // "Vxy-jerk"
+#define MSG_VX_JERK "Xジク ヤクド mm/s" // "Vx-jerk"
+#define MSG_VY_JERK "Yジク ヤクド mm/s" // "Vy-jerk"
#define MSG_VZ_JERK "Zジク ヤクド mm/s" // "Vz-jerk"
#define MSG_VE_JERK "エクストルーダー ヤクド" // "Ve-jerk"
#define MSG_VMAX "サイダイオクリソクド " // "Vmax "
diff --git a/Marlin/language_nl.h b/Marlin/language_nl.h
index 82f0a69b8b095e54ee2e183506d6efb01993a897..f21ece83058ad97fe7cec2a1d4230ab420f3e071 100644
--- a/Marlin/language_nl.h
+++ b/Marlin/language_nl.h
@@ -87,7 +87,8 @@
#define MSG_PID_D "PID-D"
#define MSG_PID_C "PID-C"
#define MSG_ACC "Versn"
-#define MSG_VXY_JERK "Vxy-jerk"
+#define MSG_VX_JERK "Vx-jerk"
+#define MSG_VY_JERK "Vy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
#define MSG_VE_JERK "Ve-jerk"
#define MSG_VMAX "Vmax "
diff --git a/Marlin/language_pl.h b/Marlin/language_pl.h
index efde140b9211f2cb09f22ccee68d0d6f7e850b85..61129aeecdca697f41422842f58ec2bf68f0362c 100644
--- a/Marlin/language_pl.h
+++ b/Marlin/language_pl.h
@@ -90,7 +90,8 @@
#define MSG_PID_D "PID-D"
#define MSG_PID_C "PID-C"
#define MSG_ACC "Przyspieszenie"
-#define MSG_VXY_JERK "Zryw Vxy"
+#define MSG_VX_JERK "Zryw Vx"
+#define MSG_VY_JERK "Zryw Vy"
#define MSG_VZ_JERK "Zryw Vz"
#define MSG_VE_JERK "Zryw Ve"
#define MSG_VMAX "Vmax "
diff --git a/Marlin/language_pt-br.h b/Marlin/language_pt-br.h
index 1db6ae6a1b90c93b59290be73e6217f6aecff7f6..fe5b834fd660a8c095ed3fc2a1a52a1ba471a00c 100644
--- a/Marlin/language_pt-br.h
+++ b/Marlin/language_pt-br.h
@@ -87,7 +87,8 @@
#define MSG_PID_D "PID-D"
#define MSG_PID_C "PID-C"
#define MSG_ACC "Acc"
-#define MSG_VXY_JERK "jogo VXY"
+#define MSG_VX_JERK "jogo VX"
+#define MSG_VY_JERK "jogo VY"
#define MSG_VZ_JERK "jogo VZ"
#define MSG_VE_JERK "jogo VE"
#define MSG_VMAX " Vmax "
diff --git a/Marlin/language_pt-br_utf8.h b/Marlin/language_pt-br_utf8.h
index 43e5d549b9284799c73e553e3a804136dd42f1c3..7fb411740376acca8206dd5f5db2cac7a6771911 100644
--- a/Marlin/language_pt-br_utf8.h
+++ b/Marlin/language_pt-br_utf8.h
@@ -87,7 +87,8 @@
#define MSG_PID_D "PID-D"
#define MSG_PID_C "PID-C"
#define MSG_ACC "Acc"
-#define MSG_VXY_JERK "jogo VXY"
+#define MSG_VX_JERK "jogo VX"
+#define MSG_VY_JERK "jogo VY"
#define MSG_VZ_JERK "jogo VZ"
#define MSG_VE_JERK "jogo VE"
#define MSG_VMAX " Vmax "
diff --git a/Marlin/language_pt.h b/Marlin/language_pt.h
index 5996dd12afd250e1687000371dade09e355dc807..d73af9ea560649b7dafbdffa752fd2736790b643 100644
--- a/Marlin/language_pt.h
+++ b/Marlin/language_pt.h
@@ -91,7 +91,8 @@
#define MSG_PID_D "PID-D"
#define MSG_PID_C "PID-C"
#define MSG_ACC "Acc"
-#define MSG_VXY_JERK "Vxy-jerk"
+#define MSG_VX_JERK "Vx-jerk"
+#define MSG_VY_JERK "Vy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
#define MSG_VE_JERK "Ve-jerk"
#define MSG_VMAX " Vmax "
diff --git a/Marlin/language_pt_utf8.h b/Marlin/language_pt_utf8.h
index ec56a86cceb932f84186a6a06c92a2dbc80e5783..536896b1d602608faa2b5a0e7da7bab8a0bc7ff5 100644
--- a/Marlin/language_pt_utf8.h
+++ b/Marlin/language_pt_utf8.h
@@ -91,7 +91,8 @@
#define MSG_PID_D "PID-D"
#define MSG_PID_C "PID-C"
#define MSG_ACC "Acc"
-#define MSG_VXY_JERK "Vxy-jerk"
+#define MSG_VX_JERK "Vx-jerk"
+#define MSG_VY_JERK "Vy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
#define MSG_VE_JERK "Ve-jerk"
#define MSG_VMAX " Vmax "
diff --git a/Marlin/language_ru.h b/Marlin/language_ru.h
index 7fb0e105564525ecfc1b657a6984558b9f465863..7441f34caaa2d5ba428d76868f76cc8d524c0dbc 100644
--- a/Marlin/language_ru.h
+++ b/Marlin/language_ru.h
@@ -91,7 +91,8 @@
#define MSG_PID_D "PID-D"
#define MSG_PID_C "PID-C"
#define MSG_ACC "Acc"
-#define MSG_VXY_JERK "Vxy-рывок"
+#define MSG_VX_JERK "Vx-рывок"
+#define MSG_VY_JERK "Vy-рывок"
#define MSG_VZ_JERK "Vz-рывок"
#define MSG_VE_JERK "Ve-рывок"
#define MSG_VMAX "Vмакс "
diff --git a/Marlin/planner.cpp b/Marlin/planner.cpp
index 2d4cd107edddac302d781738b08b8efde811cb34..959b109e59bd49e45a37cf8626ee232d51ea776b 100644
--- a/Marlin/planner.cpp
+++ b/Marlin/planner.cpp
@@ -93,9 +93,7 @@ float Planner::min_feedrate_mm_s,
Planner::acceleration, // Normal acceleration mm/s^2 DEFAULT ACCELERATION for all printing moves. M204 SXXXX
Planner::retract_acceleration, // Retract acceleration mm/s^2 filament pull-back and push-forward while standing still in the other axes M204 TXXXX
Planner::travel_acceleration, // Travel acceleration mm/s^2 DEFAULT ACCELERATION for all NON printing moves. M204 MXXXX
- Planner::max_xy_jerk, // The largest speed change requiring no acceleration
- Planner::max_z_jerk,
- Planner::max_e_jerk,
+ Planner::max_jerk[XYZE], // The largest speed change requiring no acceleration
Planner::min_travel_feedrate_mm_s;
#if HAS_ABL
@@ -152,33 +150,31 @@ void Planner::init() {
* by the provided factors.
*/
void Planner::calculate_trapezoid_for_block(block_t* block, float entry_factor, float exit_factor) {
- unsigned long initial_rate = ceil(block->nominal_rate * entry_factor),
- final_rate = ceil(block->nominal_rate * exit_factor); // (steps per second)
+ uint32_t initial_rate = ceil(block->nominal_rate * entry_factor),
+ final_rate = ceil(block->nominal_rate * exit_factor); // (steps per second)
// Limit minimal step rate (Otherwise the timer will overflow.)
NOLESS(initial_rate, 120);
NOLESS(final_rate, 120);
- long accel = block->acceleration_steps_per_s2;
- int32_t accelerate_steps = ceil(estimate_acceleration_distance(initial_rate, block->nominal_rate, accel));
- int32_t decelerate_steps = floor(estimate_acceleration_distance(block->nominal_rate, final_rate, -accel));
-
- // Calculate the size of Plateau of Nominal Rate.
- int32_t plateau_steps = block->step_event_count - accelerate_steps - decelerate_steps;
+ int32_t accel = block->acceleration_steps_per_s2,
+ accelerate_steps = ceil(estimate_acceleration_distance(initial_rate, block->nominal_rate, accel)),
+ decelerate_steps = floor(estimate_acceleration_distance(block->nominal_rate, final_rate, -accel)),
+ plateau_steps = block->step_event_count - accelerate_steps - decelerate_steps;
// Is the Plateau of Nominal Rate smaller than nothing? That means no cruising, and we will
// have to use intersection_distance() to calculate when to abort accel and start braking
// in order to reach the final_rate exactly at the end of this block.
if (plateau_steps < 0) {
accelerate_steps = ceil(intersection_distance(initial_rate, final_rate, accel, block->step_event_count));
- accelerate_steps = max(accelerate_steps, 0); // Check limits due to numerical round-off
+ NOLESS(accelerate_steps, 0); // Check limits due to numerical round-off
accelerate_steps = min((uint32_t)accelerate_steps, block->step_event_count);//(We can cast here to unsigned, because the above line ensures that we are above zero)
plateau_steps = 0;
}
#if ENABLED(ADVANCE)
- volatile long initial_advance = block->advance * sq(entry_factor);
- volatile long final_advance = block->advance * sq(exit_factor);
+ volatile int32_t initial_advance = block->advance * sq(entry_factor),
+ final_advance = block->advance * sq(exit_factor);
#endif // ADVANCE
// block->accelerate_until = accelerate_steps;
@@ -268,7 +264,7 @@ void Planner::forward_pass_kernel(block_t* previous, block_t* current) {
// If nominal length is true, max junction speed is guaranteed to be reached. No need to recheck.
if (!previous->nominal_length_flag) {
if (previous->entry_speed < current->entry_speed) {
- double entry_speed = min(current->entry_speed,
+ float entry_speed = min(current->entry_speed,
max_allowable_speed(-previous->acceleration, previous->entry_speed, previous->millimeters));
// Check for junction speed change
if (current->entry_speed != entry_speed) {
@@ -984,15 +980,13 @@ void Planner::buffer_line(ARG_X, ARG_Y, ARG_Z, const float &e, float fr_mm_s, co
#endif
// Calculate and limit speed in mm/sec for each axis
- float current_speed[NUM_AXIS];
- float speed_factor = 1.0; //factor <=1 do decrease speed
+ float current_speed[NUM_AXIS], speed_factor = 1.0; // factor <1 decreases speed
LOOP_XYZE(i) {
- current_speed[i] = delta_mm[i] * inverse_mm_s;
- float cs = fabs(current_speed[i]), mf = max_feedrate_mm_s[i];
- if (cs > mf) speed_factor = min(speed_factor, mf / cs);
+ float cs = fabs(current_speed[i] = delta_mm[i] * inverse_mm_s);
+ if (cs > max_feedrate_mm_s[i]) NOMORE(speed_factor, max_feedrate_mm_s[i] / cs);
}
- // Max segement time in us.
+ // Max segment time in µs.
#ifdef XY_FREQUENCY_LIMIT
// Check and limit the xy direction change frequency
@@ -1026,7 +1020,7 @@ void Planner::buffer_line(ARG_X, ARG_Y, ARG_Z, const float &e, float fr_mm_s, co
min_xy_segment_time = min(max_x_segment_time, max_y_segment_time);
if (min_xy_segment_time < MAX_FREQ_TIME) {
float low_sf = speed_factor * min_xy_segment_time / (MAX_FREQ_TIME);
- speed_factor = min(speed_factor, low_sf);
+ NOMORE(speed_factor, low_sf);
}
#endif // XY_FREQUENCY_LIMIT
@@ -1093,45 +1087,40 @@ void Planner::buffer_line(ARG_X, ARG_Y, ARG_Z, const float &e, float fr_mm_s, co
if (cos_theta > -0.95) {
// Compute maximum junction velocity based on maximum acceleration and junction deviation
double sin_theta_d2 = sqrt(0.5 * (1.0 - cos_theta)); // Trig half angle identity. Always positive.
- vmax_junction = min(vmax_junction,
- sqrt(block->acceleration * junction_deviation * sin_theta_d2 / (1.0 - sin_theta_d2)));
+ NOMORE(vmax_junction, sqrt(block->acceleration * junction_deviation * sin_theta_d2 / (1.0 - sin_theta_d2)));
}
}
}
#endif
// Start with a safe speed
- float vmax_junction = max_xy_jerk * 0.5,
- vmax_junction_factor = 1.0,
- mz2 = max_z_jerk * 0.5,
- me2 = max_e_jerk * 0.5,
- csz = current_speed[Z_AXIS],
- cse = current_speed[E_AXIS];
- if (fabs(csz) > mz2) vmax_junction = min(vmax_junction, mz2);
- if (fabs(cse) > me2) vmax_junction = min(vmax_junction, me2);
- vmax_junction = min(vmax_junction, block->nominal_speed);
+ float vmax_junction = max_jerk[X_AXIS] * 0.5, vmax_junction_factor = 1.0;
+ if (max_jerk[Y_AXIS] * 0.5 < fabs(current_speed[Y_AXIS])) NOMORE(vmax_junction, max_jerk[Y_AXIS] * 0.5);
+ if (max_jerk[Z_AXIS] * 0.5 < fabs(current_speed[Z_AXIS])) NOMORE(vmax_junction, max_jerk[Z_AXIS] * 0.5);
+ if (max_jerk[E_AXIS] * 0.5 < fabs(current_speed[E_AXIS])) NOMORE(vmax_junction, max_jerk[E_AXIS] * 0.5);
+ NOMORE(vmax_junction, block->nominal_speed);
float safe_speed = vmax_junction;
- if ((moves_queued > 1) && (previous_nominal_speed > 0.0001)) {
- float dsx = current_speed[X_AXIS] - previous_speed[X_AXIS],
- dsy = current_speed[Y_AXIS] - previous_speed[Y_AXIS],
- dsz = fabs(csz - previous_speed[Z_AXIS]),
- dse = fabs(cse - previous_speed[E_AXIS]),
- jerk = HYPOT(dsx, dsy);
+ if (moves_queued > 1 && previous_nominal_speed > 0.0001) {
+ //if ((fabs(previous_speed[X_AXIS]) > 0.0001) || (fabs(previous_speed[Y_AXIS]) > 0.0001)) {
+ vmax_junction = block->nominal_speed;
+ //}
- // if ((fabs(previous_speed[X_AXIS]) > 0.0001) || (fabs(previous_speed[Y_AXIS]) > 0.0001)) {
- vmax_junction = block->nominal_speed;
- // }
- if (jerk > max_xy_jerk) vmax_junction_factor = max_xy_jerk / jerk;
- if (dsz > max_z_jerk) vmax_junction_factor = min(vmax_junction_factor, max_z_jerk / dsz);
- if (dse > max_e_jerk) vmax_junction_factor = min(vmax_junction_factor, max_e_jerk / dse);
+ float dsx = fabs(current_speed[X_AXIS] - previous_speed[X_AXIS]),
+ dsy = fabs(current_speed[Y_AXIS] - previous_speed[Y_AXIS]),
+ dsz = fabs(current_speed[Z_AXIS] - previous_speed[Z_AXIS]),
+ dse = fabs(current_speed[E_AXIS] - previous_speed[E_AXIS]);
+ if (dsx > max_jerk[X_AXIS]) NOMORE(vmax_junction_factor, max_jerk[X_AXIS] / dsx);
+ if (dsy > max_jerk[Y_AXIS]) NOMORE(vmax_junction_factor, max_jerk[Y_AXIS] / dsy);
+ if (dsz > max_jerk[Z_AXIS]) NOMORE(vmax_junction_factor, max_jerk[Z_AXIS] / dsz);
+ if (dse > max_jerk[E_AXIS]) NOMORE(vmax_junction_factor, max_jerk[E_AXIS] / dse);
vmax_junction = min(previous_nominal_speed, vmax_junction * vmax_junction_factor); // Limit speed to max previous speed
}
block->max_entry_speed = vmax_junction;
// Initialize block entry speed. Compute based on deceleration to user-defined MINIMUM_PLANNER_SPEED.
- double v_allowable = max_allowable_speed(-block->acceleration, MINIMUM_PLANNER_SPEED, block->millimeters);
+ float v_allowable = max_allowable_speed(-block->acceleration, MINIMUM_PLANNER_SPEED, block->millimeters);
block->entry_speed = min(vmax_junction, v_allowable);
// Initialize planner efficiency flags
@@ -1173,7 +1162,7 @@ void Planner::buffer_line(ARG_X, ARG_Y, ARG_Z, const float &e, float fr_mm_s, co
}
else {
long acc_dist = estimate_acceleration_distance(0, block->nominal_rate, block->acceleration_steps_per_s2);
- float advance = ((STEPS_PER_CUBIC_MM_E) * (EXTRUDER_ADVANCE_K)) * HYPOT(cse, EXTRUSION_AREA) * 256;
+ float advance = ((STEPS_PER_CUBIC_MM_E) * (EXTRUDER_ADVANCE_K)) * HYPOT(current_speed[E_AXIS], EXTRUSION_AREA) * 256;
block->advance = advance;
block->advance_rate = acc_dist ? advance / (float)acc_dist : 0;
}
diff --git a/Marlin/planner.h b/Marlin/planner.h
index c198f083aa72e672b61135bd2a37ed3f427f1724..0e95be4cd953e9e4cbdfc591e805308df7c1932d 100644
--- a/Marlin/planner.h
+++ b/Marlin/planner.h
@@ -132,9 +132,7 @@ class Planner {
static float acceleration; // Normal acceleration mm/s^2 DEFAULT ACCELERATION for all printing moves. M204 SXXXX
static float retract_acceleration; // Retract acceleration mm/s^2 filament pull-back and push-forward while standing still in the other axes M204 TXXXX
static float travel_acceleration; // Travel acceleration mm/s^2 DEFAULT ACCELERATION for all NON printing moves. M204 MXXXX
- static float max_xy_jerk; // The largest speed change requiring no acceleration
- static float max_z_jerk;
- static float max_e_jerk;
+ static float max_jerk[XYZE]; // The largest speed change requiring no acceleration
static float min_travel_feedrate_mm_s;
#if HAS_ABL
diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp
index 5e57188743739cfb11aaf0ba57f90f5ed34dd3ed..c3053cd1c1d85b99f06da3bcbc0c86bb337b279d 100644
--- a/Marlin/temperature.cpp
+++ b/Marlin/temperature.cpp
@@ -265,8 +265,8 @@ uint8_t Temperature::soft_pwm[HOTENDS];
#endif
;
- max = max(max, input);
- min = min(min, input);
+ NOLESS(max, input);
+ NOMORE(min, input);
#if HAS_AUTO_FAN
if (ELAPSED(ms, next_auto_fan_check_ms)) {
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index da5440c5d847fa6b48c0ddb389174bc3c87fb711..884c6442b058bb1e229eb7707c9d37a91b25e3a8 100755
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@@ -1812,13 +1812,14 @@ void kill_screen(const char* lcd_msg) {
MENU_ITEM_EDIT(float43, MSG_BED_Z, &mbl.z_offset, -1, 1);
#endif
MENU_ITEM_EDIT(float5, MSG_ACC, &planner.acceleration, 10, 99000);
- MENU_ITEM_EDIT(float3, MSG_VXY_JERK, &planner.max_xy_jerk, 1, 990);
+ MENU_ITEM_EDIT(float3, MSG_VX_JERK, &planner.max_jerk[X_AXIS], 1, 990);
+ MENU_ITEM_EDIT(float3, MSG_VY_JERK, &planner.max_jerk[Y_AXIS], 1, 990);
#if ENABLED(DELTA)
- MENU_ITEM_EDIT(float3, MSG_VZ_JERK, &planner.max_z_jerk, 1, 990);
+ MENU_ITEM_EDIT(float3, MSG_VZ_JERK, &planner.max_jerk[Y_AXIS], 1, 990);
#else
- MENU_ITEM_EDIT(float52, MSG_VZ_JERK, &planner.max_z_jerk, 0.1, 990);
+ MENU_ITEM_EDIT(float52, MSG_VZ_JERK, &planner.max_jerk[Z_AXIS], 0.1, 990);
#endif
- MENU_ITEM_EDIT(float3, MSG_VE_JERK, &planner.max_e_jerk, 1, 990);
+ MENU_ITEM_EDIT(float3, MSG_VE_JERK, &planner.max_jerk[E_AXIS], 1, 990);
MENU_ITEM_EDIT(float3, MSG_VMAX MSG_X, &planner.max_feedrate_mm_s[X_AXIS], 1, 999);
MENU_ITEM_EDIT(float3, MSG_VMAX MSG_Y, &planner.max_feedrate_mm_s[Y_AXIS], 1, 999);
MENU_ITEM_EDIT(float3, MSG_VMAX MSG_Z, &planner.max_feedrate_mm_s[Z_AXIS], 1, 999);