diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 0e7982ffa..1c0974ea9 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.05 - #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/src/config/default/Configuration_adv.h b/Marlin/src/config/default/Configuration_adv.h index 0e7982ffa..1c0974ea9 100644 --- a/Marlin/src/config/default/Configuration_adv.h +++ b/Marlin/src/config/default/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h index aa902de8f..b68bd8da3 100644 --- a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h +++ b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/Anet/A6/Configuration_adv.h b/Marlin/src/config/examples/Anet/A6/Configuration_adv.h index bdd7c78ef..4471305b6 100644 --- a/Marlin/src/config/examples/Anet/A6/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A6/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/Anet/A8/Configuration_adv.h b/Marlin/src/config/examples/Anet/A8/Configuration_adv.h index fdb5c7e4d..48199afc6 100644 --- a/Marlin/src/config/examples/Anet/A8/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A8/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/Azteeg/X5GT/Configuration_adv.h b/Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h index 0e7982ffa..1c0974ea9 100644 --- a/Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h +++ b/Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h index ab3345024..f8125fe7c 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h +++ b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/BIBO/TouchX/default/Configuration_adv.h b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h index 1f1db2f90..83f82c77e 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h +++ b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/BQ/Hephestos/Configuration_adv.h b/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h index 0e00da526..a8374ce43 100644 --- a/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/BQ/Hephestos_2/Configuration_adv.h b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h index 405dd72b5..0744daf2a 100644 --- a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/BQ/WITBOX/Configuration_adv.h b/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h index 0e00da526..a8374ce43 100644 --- a/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/Cartesio/Configuration_adv.h b/Marlin/src/config/examples/Cartesio/Configuration_adv.h index eaa3be19e..9594b1c71 100644 --- a/Marlin/src/config/examples/Cartesio/Configuration_adv.h +++ b/Marlin/src/config/examples/Cartesio/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/Creality/CR-10/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h index cad97f989..34b4f47a5 100755 --- a/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/Creality/CR-10S/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h index 0fb10d689..14a60c589 100644 --- a/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/Creality/CR-10mini/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h index e7d551306..b15610939 100644 --- a/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/Creality/CR-8/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h index 65b720c1e..eb1b41359 100644 --- a/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/Creality/Ender-2/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h index 1cea80018..cdffa5f91 100644 --- a/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/Creality/Ender-3/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h index d298c00df..e09e1dcd8 100644 --- a/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/Creality/Ender-4/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h index 65b720c1e..eb1b41359 100644 --- a/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/Felix/Configuration_adv.h b/Marlin/src/config/examples/Felix/Configuration_adv.h index 7a212cb74..88cbfb1b2 100644 --- a/Marlin/src/config/examples/Felix/Configuration_adv.h +++ b/Marlin/src/config/examples/Felix/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h index 02021ae6f..6c12c704d 100644 --- a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h +++ b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h index 1679f9681..9003cf881 100644 --- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h +++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h index 1679f9681..9003cf881 100644 --- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h +++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/Infitary/i3-M508/Configuration_adv.h b/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h index 0c785128c..87faf0d99 100644 --- a/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h +++ b/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/JGAurora/A5/Configuration_adv.h b/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h index d50735fa8..375086c6b 100644 --- a/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h +++ b/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/MakerParts/Configuration_adv.h b/Marlin/src/config/examples/MakerParts/Configuration_adv.h index 288a689af..7a1ce46be 100644 --- a/Marlin/src/config/examples/MakerParts/Configuration_adv.h +++ b/Marlin/src/config/examples/MakerParts/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/Malyan/M150/Configuration_adv.h b/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h index 5e53f5ad5..001e309c7 100644 --- a/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h +++ b/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/Malyan/M200/Configuration_adv.h b/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h index 8ee5b2fe9..62ed80711 100644 --- a/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h +++ b/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h index 3514dcddb..06771261c 100644 --- a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h +++ b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/Mks/Sbase/Configuration_adv.h b/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h index dddca81c2..d5eed23cf 100644 --- a/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h +++ b/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/RigidBot/Configuration_adv.h b/Marlin/src/config/examples/RigidBot/Configuration_adv.h index d9435dffb..3402c80ed 100644 --- a/Marlin/src/config/examples/RigidBot/Configuration_adv.h +++ b/Marlin/src/config/examples/RigidBot/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/SCARA/Configuration_adv.h b/Marlin/src/config/examples/SCARA/Configuration_adv.h index 9915a6e6d..057747070 100644 --- a/Marlin/src/config/examples/SCARA/Configuration_adv.h +++ b/Marlin/src/config/examples/SCARA/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/Sanguinololu/Configuration_adv.h b/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h index 22f18730c..8ee2b34fb 100644 --- a/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h +++ b/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/TheBorg/Configuration_adv.h b/Marlin/src/config/examples/TheBorg/Configuration_adv.h index 9614024a3..7c46676d8 100644 --- a/Marlin/src/config/examples/TheBorg/Configuration_adv.h +++ b/Marlin/src/config/examples/TheBorg/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/TinyBoy2/Configuration_adv.h b/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h index 74f945379..46c7f2ec2 100644 --- a/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h +++ b/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/UltiMachine/Archim2/Configuration_adv.h b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h index 00cbefd5f..7ae6d73f5 100644 --- a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h +++ b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/Velleman/K8200/Configuration_adv.h b/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h index eb596bbb0..cdefdd0b1 100644 --- a/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h +++ b/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h @@ -449,8 +449,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/Velleman/K8400/Configuration_adv.h b/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h index 970f3dd56..61050cbb7 100644 --- a/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h +++ b/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h index 521d56257..1f2ee3c3d 100644 --- a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h +++ b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h index aae07edfb..53bc85dfa 100644 --- a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h @@ -448,8 +448,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h index bd94fb40d..cfe8cc075 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h @@ -448,8 +448,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h index dcc975e44..ab3cbe0bb 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h @@ -448,8 +448,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/delta/generic/Configuration_adv.h b/Marlin/src/config/examples/delta/generic/Configuration_adv.h index dcc975e44..ab3cbe0bb 100644 --- a/Marlin/src/config/examples/delta/generic/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/generic/Configuration_adv.h @@ -448,8 +448,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/delta/kossel_mini/Configuration_adv.h b/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h index dcc975e44..ab3cbe0bb 100644 --- a/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h @@ -448,8 +448,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/delta/kossel_pro/Configuration_adv.h b/Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h index c5890f22e..32f711bcf 100644 --- a/Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h @@ -453,8 +453,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/delta/kossel_xl/Configuration_adv.h b/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h index 489470ede..794188a5a 100644 --- a/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h @@ -448,8 +448,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h index 9c134971d..0ce38e46a 100644 --- a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h +++ b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/makibox/Configuration_adv.h b/Marlin/src/config/examples/makibox/Configuration_adv.h index 3f37a6512..8f44da9f0 100644 --- a/Marlin/src/config/examples/makibox/Configuration_adv.h +++ b/Marlin/src/config/examples/makibox/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/tvrrug/Round2/Configuration_adv.h b/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h index ac578a43d..fadbfd9fb 100644 --- a/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/config/examples/wt150/Configuration_adv.h b/Marlin/src/config/examples/wt150/Configuration_adv.h index cbd6aeea0..30bb13a9e 100644 --- a/Marlin/src/config/examples/wt150/Configuration_adv.h +++ b/Marlin/src/config/examples/wt150/Configuration_adv.h @@ -446,8 +446,8 @@ // //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_FACTOR 0.05 - #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/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index a1480c2cb..d37f16b22 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/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/src/module/planner.cpp b/Marlin/src/module/planner.cpp index f480c0a90..7d7e36982 100644 --- a/Marlin/src/module/planner.cpp +++ b/Marlin/src/module/planner.cpp @@ -2230,7 +2230,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 @@ -2238,7 +2238,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); } }