From 0bfb10ffb6dc78b46cb41ac7c7d2efc45f01f8d7 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 26 May 2018 01:59:29 -0500
Subject: [PATCH] Rename Junction Deviation options
---
Marlin/Configuration_adv.h | 4 ++--
Marlin/SanityCheck.h | 4 ++++
.../AlephObjects/TAZ4/Configuration_adv.h | 4 ++--
Marlin/example_configurations/Anet/A6/Configuration_adv.h | 4 ++--
Marlin/example_configurations/Anet/A8/Configuration_adv.h | 4 ++--
.../BIBO/TouchX/Cyclops/Configuration_adv.h | 4 ++--
.../BIBO/TouchX/default/Configuration_adv.h | 4 ++--
.../example_configurations/BQ/Hephestos/Configuration_adv.h | 4 ++--
.../example_configurations/BQ/Hephestos_2/Configuration_adv.h | 4 ++--
Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h | 4 ++--
Marlin/example_configurations/Cartesio/Configuration_adv.h | 4 ++--
.../example_configurations/Creality/CR-10/Configuration_adv.h | 4 ++--
.../Creality/CR-10S/Configuration_adv.h | 4 ++--
.../Creality/CR-10mini/Configuration_adv.h | 4 ++--
.../example_configurations/Creality/CR-8/Configuration_adv.h | 4 ++--
.../Creality/Ender-2/Configuration_adv.h | 4 ++--
.../Creality/Ender-3/Configuration_adv.h | 4 ++--
.../Creality/Ender-4/Configuration_adv.h | 4 ++--
Marlin/example_configurations/Felix/Configuration_adv.h | 4 ++--
.../FolgerTech/i3-2020/Configuration_adv.h | 4 ++--
.../Geeetech/Prusa i3 Pro C/Configuration_adv.h | 4 ++--
.../Geeetech/Prusa i3 Pro W/Configuration_adv.h | 4 ++--
.../Infitary/i3-M508/Configuration_adv.h | 4 ++--
Marlin/example_configurations/JGAurora/A5/Configuration_adv.h | 4 ++--
Marlin/example_configurations/Malyan/M150/Configuration_adv.h | 4 ++--
.../Micromake/C1/enhanced/Configuration_adv.h | 4 ++--
Marlin/example_configurations/RigidBot/Configuration_adv.h | 4 ++--
Marlin/example_configurations/SCARA/Configuration_adv.h | 4 ++--
.../example_configurations/Sanguinololu/Configuration_adv.h | 4 ++--
Marlin/example_configurations/TinyBoy2/Configuration_adv.h | 4 ++--
.../example_configurations/Velleman/K8200/Configuration_adv.h | 4 ++--
.../example_configurations/Velleman/K8400/Configuration_adv.h | 4 ++--
.../Wanhao/Duplicator 6/Configuration_adv.h | 4 ++--
.../delta/FLSUN/auto_calibrate/Configuration_adv.h | 4 ++--
.../delta/FLSUN/kossel/Configuration_adv.h | 4 ++--
.../delta/FLSUN/kossel_mini/Configuration_adv.h | 4 ++--
.../example_configurations/delta/generic/Configuration_adv.h | 4 ++--
.../delta/kossel_mini/Configuration_adv.h | 4 ++--
.../delta/kossel_pro/Configuration_adv.h | 4 ++--
.../delta/kossel_xl/Configuration_adv.h | 4 ++--
.../gCreate/gMax1.5+/Configuration_adv.h | 4 ++--
Marlin/example_configurations/makibox/Configuration_adv.h | 4 ++--
.../example_configurations/tvrrug/Round2/Configuration_adv.h | 4 ++--
Marlin/example_configurations/wt150/Configuration_adv.h | 4 ++--
Marlin/planner.cpp | 4 ++--
45 files changed, 92 insertions(+), 88 deletions(-)
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index fa47b98e68..308f47c2a6 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h
index b80016c2eb..5cc5c4cf39 100644
--- a/Marlin/SanityCheck.h
+++ b/Marlin/SanityCheck.h
@@ -275,6 +275,10 @@
#error "LEVEL_BED_CORNERS requires a LEVEL_CORNERS_INSET value. Please update your Configuration.h."
#elif defined(BEZIER_JERK_CONTROL)
#error "BEZIER_JERK_CONTROL is now S_CURVE_ACCELERATION. Please update your configuration."
+#elif defined(JUNCTION_DEVIATION_FACTOR)
+ #error "JUNCTION_DEVIATION_FACTOR is now JUNCTION_DEVIATION_MM. Please update your configuration."
+#elif defined(JUNCTION_ACCELERATION_FACTOR)
+ #error "JUNCTION_ACCELERATION_FACTOR is now JUNCTION_ACCELERATION. Please update your configuration."
#endif
#define BOARD_MKS_13 -47
diff --git a/Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h b/Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h
index 48cd12a45d..396292e07f 100644
--- a/Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h
+++ b/Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/Anet/A6/Configuration_adv.h b/Marlin/example_configurations/Anet/A6/Configuration_adv.h
index cfc56ca46b..9885317913 100644
--- a/Marlin/example_configurations/Anet/A6/Configuration_adv.h
+++ b/Marlin/example_configurations/Anet/A6/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/Anet/A8/Configuration_adv.h b/Marlin/example_configurations/Anet/A8/Configuration_adv.h
index 1baf4f1541..fbe82a0790 100644
--- a/Marlin/example_configurations/Anet/A8/Configuration_adv.h
+++ b/Marlin/example_configurations/Anet/A8/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/BIBO/TouchX/Cyclops/Configuration_adv.h b/Marlin/example_configurations/BIBO/TouchX/Cyclops/Configuration_adv.h
index a1f3308bb9..f5f12c7f01 100644
--- a/Marlin/example_configurations/BIBO/TouchX/Cyclops/Configuration_adv.h
+++ b/Marlin/example_configurations/BIBO/TouchX/Cyclops/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/BIBO/TouchX/default/Configuration_adv.h b/Marlin/example_configurations/BIBO/TouchX/default/Configuration_adv.h
index fa47b98e68..308f47c2a6 100644
--- a/Marlin/example_configurations/BIBO/TouchX/default/Configuration_adv.h
+++ b/Marlin/example_configurations/BIBO/TouchX/default/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h b/Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h
index 5f633fd770..4fe27e8ffc 100644
--- a/Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h
+++ b/Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h b/Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h
index c4cdd64b10..5f87e19f0a 100644
--- a/Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h
+++ b/Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h b/Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h
index 5f633fd770..4fe27e8ffc 100644
--- a/Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h
+++ b/Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/Cartesio/Configuration_adv.h b/Marlin/example_configurations/Cartesio/Configuration_adv.h
index cc2fccb6ab..4187470771 100644
--- a/Marlin/example_configurations/Cartesio/Configuration_adv.h
+++ b/Marlin/example_configurations/Cartesio/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/Creality/CR-10/Configuration_adv.h b/Marlin/example_configurations/Creality/CR-10/Configuration_adv.h
index c8ea63ef80..5d14fa8406 100755
--- a/Marlin/example_configurations/Creality/CR-10/Configuration_adv.h
+++ b/Marlin/example_configurations/Creality/CR-10/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/Creality/CR-10S/Configuration_adv.h b/Marlin/example_configurations/Creality/CR-10S/Configuration_adv.h
index 722c7a5788..5da32dd8a5 100644
--- a/Marlin/example_configurations/Creality/CR-10S/Configuration_adv.h
+++ b/Marlin/example_configurations/Creality/CR-10S/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/Creality/CR-10mini/Configuration_adv.h b/Marlin/example_configurations/Creality/CR-10mini/Configuration_adv.h
index ff88868165..b2d0a82408 100644
--- a/Marlin/example_configurations/Creality/CR-10mini/Configuration_adv.h
+++ b/Marlin/example_configurations/Creality/CR-10mini/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/Creality/CR-8/Configuration_adv.h b/Marlin/example_configurations/Creality/CR-8/Configuration_adv.h
index 44b7a26572..e7c6a8dc4f 100644
--- a/Marlin/example_configurations/Creality/CR-8/Configuration_adv.h
+++ b/Marlin/example_configurations/Creality/CR-8/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/Creality/Ender-2/Configuration_adv.h b/Marlin/example_configurations/Creality/Ender-2/Configuration_adv.h
index 617ad7bcb3..8fcf0f5932 100644
--- a/Marlin/example_configurations/Creality/Ender-2/Configuration_adv.h
+++ b/Marlin/example_configurations/Creality/Ender-2/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/Creality/Ender-3/Configuration_adv.h b/Marlin/example_configurations/Creality/Ender-3/Configuration_adv.h
index 691602db57..bca2b254f4 100644
--- a/Marlin/example_configurations/Creality/Ender-3/Configuration_adv.h
+++ b/Marlin/example_configurations/Creality/Ender-3/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/Creality/Ender-4/Configuration_adv.h b/Marlin/example_configurations/Creality/Ender-4/Configuration_adv.h
index 44b7a26572..e7c6a8dc4f 100644
--- a/Marlin/example_configurations/Creality/Ender-4/Configuration_adv.h
+++ b/Marlin/example_configurations/Creality/Ender-4/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/Felix/Configuration_adv.h b/Marlin/example_configurations/Felix/Configuration_adv.h
index 94dfb0882a..aa15b8181d 100644
--- a/Marlin/example_configurations/Felix/Configuration_adv.h
+++ b/Marlin/example_configurations/Felix/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/FolgerTech/i3-2020/Configuration_adv.h b/Marlin/example_configurations/FolgerTech/i3-2020/Configuration_adv.h
index c4feb462e1..de9c42b292 100644
--- a/Marlin/example_configurations/FolgerTech/i3-2020/Configuration_adv.h
+++ b/Marlin/example_configurations/FolgerTech/i3-2020/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/Geeetech/Prusa i3 Pro C/Configuration_adv.h b/Marlin/example_configurations/Geeetech/Prusa i3 Pro C/Configuration_adv.h
index a1f1ec34d2..059609229e 100644
--- a/Marlin/example_configurations/Geeetech/Prusa i3 Pro C/Configuration_adv.h
+++ b/Marlin/example_configurations/Geeetech/Prusa i3 Pro C/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/Geeetech/Prusa i3 Pro W/Configuration_adv.h b/Marlin/example_configurations/Geeetech/Prusa i3 Pro W/Configuration_adv.h
index a1f1ec34d2..059609229e 100644
--- a/Marlin/example_configurations/Geeetech/Prusa i3 Pro W/Configuration_adv.h
+++ b/Marlin/example_configurations/Geeetech/Prusa i3 Pro W/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h b/Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h
index c267061cf2..2188aad217 100644
--- a/Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h
+++ b/Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/JGAurora/A5/Configuration_adv.h b/Marlin/example_configurations/JGAurora/A5/Configuration_adv.h
index d3da83eee4..0c2adecb43 100644
--- a/Marlin/example_configurations/JGAurora/A5/Configuration_adv.h
+++ b/Marlin/example_configurations/JGAurora/A5/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/Malyan/M150/Configuration_adv.h b/Marlin/example_configurations/Malyan/M150/Configuration_adv.h
index 884ab1cdf3..5142843f4e 100644
--- a/Marlin/example_configurations/Malyan/M150/Configuration_adv.h
+++ b/Marlin/example_configurations/Malyan/M150/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/Micromake/C1/enhanced/Configuration_adv.h b/Marlin/example_configurations/Micromake/C1/enhanced/Configuration_adv.h
index a92d8c0266..12ba0e1560 100644
--- a/Marlin/example_configurations/Micromake/C1/enhanced/Configuration_adv.h
+++ b/Marlin/example_configurations/Micromake/C1/enhanced/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/RigidBot/Configuration_adv.h b/Marlin/example_configurations/RigidBot/Configuration_adv.h
index 8bb38a5d95..6e70715f74 100644
--- a/Marlin/example_configurations/RigidBot/Configuration_adv.h
+++ b/Marlin/example_configurations/RigidBot/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/SCARA/Configuration_adv.h b/Marlin/example_configurations/SCARA/Configuration_adv.h
index d9ab449e44..91c907182e 100644
--- a/Marlin/example_configurations/SCARA/Configuration_adv.h
+++ b/Marlin/example_configurations/SCARA/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/Sanguinololu/Configuration_adv.h b/Marlin/example_configurations/Sanguinololu/Configuration_adv.h
index 96ec6c3a96..ed42c1e145 100644
--- a/Marlin/example_configurations/Sanguinololu/Configuration_adv.h
+++ b/Marlin/example_configurations/Sanguinololu/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/TinyBoy2/Configuration_adv.h b/Marlin/example_configurations/TinyBoy2/Configuration_adv.h
index aaf32b37fc..6f6bbbfb8e 100644
--- a/Marlin/example_configurations/TinyBoy2/Configuration_adv.h
+++ b/Marlin/example_configurations/TinyBoy2/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/Velleman/K8200/Configuration_adv.h b/Marlin/example_configurations/Velleman/K8200/Configuration_adv.h
index 1f8ad3f4d9..530a809f67 100644
--- a/Marlin/example_configurations/Velleman/K8200/Configuration_adv.h
+++ b/Marlin/example_configurations/Velleman/K8200/Configuration_adv.h
@@ -449,8 +449,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/Velleman/K8400/Configuration_adv.h b/Marlin/example_configurations/Velleman/K8400/Configuration_adv.h
index c2fc623a3a..f2a1cef9e3 100644
--- a/Marlin/example_configurations/Velleman/K8400/Configuration_adv.h
+++ b/Marlin/example_configurations/Velleman/K8400/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/Wanhao/Duplicator 6/Configuration_adv.h b/Marlin/example_configurations/Wanhao/Duplicator 6/Configuration_adv.h
index 8f6f9d477c..e7986250fe 100644
--- a/Marlin/example_configurations/Wanhao/Duplicator 6/Configuration_adv.h
+++ b/Marlin/example_configurations/Wanhao/Duplicator 6/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h
index 38ba9fd1db..352780b433 100644
--- a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h
@@ -448,8 +448,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/delta/FLSUN/kossel/Configuration_adv.h b/Marlin/example_configurations/delta/FLSUN/kossel/Configuration_adv.h
index 811f21dbd5..558db01997 100644
--- a/Marlin/example_configurations/delta/FLSUN/kossel/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/FLSUN/kossel/Configuration_adv.h
@@ -448,8 +448,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h
index 69ac6fcc8e..b4599ce977 100644
--- a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h
@@ -448,8 +448,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/delta/generic/Configuration_adv.h b/Marlin/example_configurations/delta/generic/Configuration_adv.h
index 69ac6fcc8e..b4599ce977 100644
--- a/Marlin/example_configurations/delta/generic/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/generic/Configuration_adv.h
@@ -448,8 +448,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
index 69ac6fcc8e..b4599ce977 100644
--- a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
@@ -448,8 +448,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
index 5412f392a7..a78d3b192a 100644
--- a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
@@ -453,8 +453,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
index 7ca4b0f547..5e9809ad75 100644
--- a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
@@ -448,8 +448,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h b/Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h
index d14767a624..ed0b257a20 100644
--- a/Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h
+++ b/Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/makibox/Configuration_adv.h b/Marlin/example_configurations/makibox/Configuration_adv.h
index baf491a109..a11003e28f 100644
--- a/Marlin/example_configurations/makibox/Configuration_adv.h
+++ b/Marlin/example_configurations/makibox/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
index 9601f6a4e5..f5967a5e33 100644
--- a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
+++ b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/example_configurations/wt150/Configuration_adv.h b/Marlin/example_configurations/wt150/Configuration_adv.h
index 7ea8df009d..7e696de452 100644
--- a/Marlin/example_configurations/wt150/Configuration_adv.h
+++ b/Marlin/example_configurations/wt150/Configuration_adv.h
@@ -446,8 +446,8 @@
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_FACTOR 0.02
- #define JUNCTION_ACCELERATION_FACTOR 1000
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+ #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E
#endif
diff --git a/Marlin/planner.cpp b/Marlin/planner.cpp
index e635cf557d..3d506f9097 100644
--- a/Marlin/planner.cpp
+++ b/Marlin/planner.cpp
@@ -2212,7 +2212,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
// TODO: Technically, the acceleration used in calculation needs to be limited by the minimum of the
// two junctions. However, this shouldn't be a significant problem except in extreme circumstances.
- vmax_junction_sqr = (JUNCTION_ACCELERATION_FACTOR * JUNCTION_DEVIATION_FACTOR * sin_theta_d2) / (1.0 - sin_theta_d2);
+ vmax_junction_sqr = (JUNCTION_ACCELERATION * JUNCTION_DEVIATION_MM * sin_theta_d2) / (1.0 - sin_theta_d2);
if (block->millimeters < 1.0) {
// Fast acos approximation, minus the error bar to be safe
@@ -2220,7 +2220,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
// If angle is greater than 135 degrees (octagon), find speed for approximate arc
if (junction_theta > RADIANS(135)) {
- const float limit_sqr = block->millimeters / (RADIANS(180) - junction_theta) * JUNCTION_ACCELERATION_FACTOR;
+ const float limit_sqr = block->millimeters / (RADIANS(180) - junction_theta) * JUNCTION_ACCELERATION;
NOMORE(vmax_junction_sqr, limit_sqr);
}
}