From bd7f5848f1a87b5db4709178bf1024de8aff694e Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 29 Jun 2018 22:42:05 -0500 Subject: [PATCH] Remove JUNCTION_DEVIATION_INCLUDE_E option (#11147) --- Marlin/Configuration_adv.h | 1 - Marlin/src/config/default/Configuration_adv.h | 1 - .../AlephObjects/TAZ4/Configuration_adv.h | 1 - .../examples/Anet/A6/Configuration_adv.h | 1 - .../examples/Anet/A8/Configuration_adv.h | 1 - .../examples/Azteeg/X5GT/Configuration_adv.h | 1 - .../BIBO/TouchX/cyclops/Configuration_adv.h | 1 - .../BIBO/TouchX/default/Configuration_adv.h | 1 - .../examples/BQ/Hephestos/Configuration_adv.h | 1 - .../BQ/Hephestos_2/Configuration_adv.h | 1 - .../examples/BQ/WITBOX/Configuration_adv.h | 1 - .../examples/Cartesio/Configuration_adv.h | 1 - .../Creality/CR-10/Configuration_adv.h | 1 - .../Creality/CR-10S/Configuration_adv.h | 1 - .../Creality/CR-10mini/Configuration_adv.h | 1 - .../Creality/CR-8/Configuration_adv.h | 1 - .../Creality/Ender-2/Configuration_adv.h | 1 - .../Creality/Ender-3/Configuration_adv.h | 1 - .../Creality/Ender-4/Configuration_adv.h | 1 - .../config/examples/Felix/Configuration_adv.h | 1 - .../FolgerTech/i3-2020/Configuration_adv.h | 1 - .../Prusa i3 Pro C/Configuration_adv.h | 1 - .../Prusa i3 Pro W/Configuration_adv.h | 1 - .../Infitary/i3-M508/Configuration_adv.h | 1 - .../examples/JGAurora/A5/Configuration_adv.h | 1 - .../examples/MakerParts/Configuration_adv.h | 1 - .../examples/Malyan/M150/Configuration_adv.h | 1 - .../examples/Malyan/M200/Configuration_adv.h | 1 - .../Micromake/C1/enhanced/Configuration_adv.h | 1 - .../examples/Mks/Sbase/Configuration_adv.h | 1 - .../examples/RigidBot/Configuration_adv.h | 1 - .../config/examples/SCARA/Configuration_adv.h | 1 - .../examples/Sanguinololu/Configuration_adv.h | 1 - .../examples/TheBorg/Configuration_adv.h | 1 - .../examples/TinyBoy2/Configuration_adv.h | 1 - .../UltiMachine/Archim2/Configuration_adv.h | 1 - .../Velleman/K8200/Configuration_adv.h | 1 - .../Velleman/K8400/Configuration_adv.h | 1 - .../Wanhao/Duplicator 6/Configuration_adv.h | 1 - .../FLSUN/auto_calibrate/Configuration_adv.h | 1 - .../delta/FLSUN/kossel/Configuration_adv.h | 1 - .../FLSUN/kossel_mini/Configuration_adv.h | 1 - .../delta/generic/Configuration_adv.h | 1 - .../delta/kossel_mini/Configuration_adv.h | 1 - .../delta/kossel_pro/Configuration_adv.h | 1 - .../delta/kossel_xl/Configuration_adv.h | 1 - .../gCreate/gMax1.5+/Configuration_adv.h | 1 - .../examples/makibox/Configuration_adv.h | 1 - .../tvrrug/Round2/Configuration_adv.h | 1 - .../config/examples/wt150/Configuration_adv.h | 1 - Marlin/src/module/planner.cpp | 28 ++++++------------- Marlin/src/module/planner.h | 16 ++++------- 52 files changed, 13 insertions(+), 81 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index b8cc639f58..cd58c6e10d 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 b8cc639f58..cd58c6e10d 100644 --- a/Marlin/src/config/default/Configuration_adv.h +++ b/Marlin/src/config/default/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 8d84be5a29..074edfca3a 100644 --- a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h +++ b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 7e75ee7ec0..ae63fb9df1 100644 --- a/Marlin/src/config/examples/Anet/A6/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A6/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 359dea7632..f0b93b9cce 100644 --- a/Marlin/src/config/examples/Anet/A8/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A8/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 b8cc639f58..cd58c6e10d 100644 --- a/Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h +++ b/Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 3030fadb6f..ce1787d707 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h +++ b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 2351b44f2a..f1b1cad8ab 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h +++ b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 2e9dd996dd..cce42c75e3 100644 --- a/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 7a1f07bcce..b3e08e2775 100644 --- a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 2e9dd996dd..cce42c75e3 100644 --- a/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 de63b64e93..5c0b1690bf 100644 --- a/Marlin/src/config/examples/Cartesio/Configuration_adv.h +++ b/Marlin/src/config/examples/Cartesio/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 8114222abf..f4db5dbeaf 100755 --- a/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 79b4592310..5a45bc2c49 100644 --- a/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 0c927457a6..6f89cf635a 100644 --- a/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 4a5bcf53f8..4458376d7c 100644 --- a/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 dfd82bcf55..d1ef61dae4 100644 --- a/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 11def57b6b..1243b2d5ee 100644 --- a/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 4a5bcf53f8..4458376d7c 100644 --- a/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 00c355a5cd..e5bde478b6 100644 --- a/Marlin/src/config/examples/Felix/Configuration_adv.h +++ b/Marlin/src/config/examples/Felix/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 439be1705a..086507c806 100644 --- a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h +++ b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 4ed2e5d0f0..7ea6d77256 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 @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 4ed2e5d0f0..7ea6d77256 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 @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 29802c8d49..5e81709af8 100644 --- a/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h +++ b/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 ee38261085..e37cae980d 100644 --- a/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h +++ b/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 bb8b4f5db5..5d95bdf785 100644 --- a/Marlin/src/config/examples/MakerParts/Configuration_adv.h +++ b/Marlin/src/config/examples/MakerParts/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 9d37952195..0ad6b45c4e 100644 --- a/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h +++ b/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 760fb7b56b..ed0323981f 100644 --- a/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h +++ b/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 acd86a336c..faef3301bf 100644 --- a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h +++ b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 6e5e729c1f..1cf7c56ed3 100644 --- a/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h +++ b/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 b39dd81e88..88cf7dd465 100644 --- a/Marlin/src/config/examples/RigidBot/Configuration_adv.h +++ b/Marlin/src/config/examples/RigidBot/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 09d1259c77..d6b99235f7 100644 --- a/Marlin/src/config/examples/SCARA/Configuration_adv.h +++ b/Marlin/src/config/examples/SCARA/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 8393383c08..daf7359e33 100644 --- a/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h +++ b/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 16350e7bb7..60c8f4270d 100644 --- a/Marlin/src/config/examples/TheBorg/Configuration_adv.h +++ b/Marlin/src/config/examples/TheBorg/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 7702d7485a..c44ae7e9b2 100644 --- a/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h +++ b/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 76adbf628e..807b926d43 100644 --- a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h +++ b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 844a4ad753..2dac78cea2 100644 --- a/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h +++ b/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h @@ -450,7 +450,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 e07138bab7..f8fb9dd2e0 100644 --- a/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h +++ b/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 2bf5925727..8c2fd913a4 100644 --- a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h +++ b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 e096e76131..02af9293f2 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 @@ -449,7 +449,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 727dcb5b46..68ec1a6755 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h @@ -449,7 +449,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 4812e6a4ca..86651be99d 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 @@ -449,7 +449,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 4812e6a4ca..86651be99d 100644 --- a/Marlin/src/config/examples/delta/generic/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/generic/Configuration_adv.h @@ -449,7 +449,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 4812e6a4ca..86651be99d 100644 --- a/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h @@ -449,7 +449,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 4ff9a3fcb7..6585badbe2 100644 --- a/Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h @@ -454,7 +454,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 b11ac887f1..c294ee710e 100644 --- a/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h @@ -449,7 +449,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 00c4676fdb..e6432d98ab 100644 --- a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h +++ b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 d29730d8de..a945585fae 100644 --- a/Marlin/src/config/examples/makibox/Configuration_adv.h +++ b/Marlin/src/config/examples/makibox/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 92cd3e8b54..f74a81506f 100644 --- a/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#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 17bd7b4a50..03b0efcae3 100644 --- a/Marlin/src/config/examples/wt150/Configuration_adv.h +++ b/Marlin/src/config/examples/wt150/Configuration_adv.h @@ -447,7 +447,6 @@ //#define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge - //#define JUNCTION_DEVIATION_INCLUDE_E #endif /** diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp index 20e4410ce9..4152d2e0d6 100644 --- a/Marlin/src/module/planner.cpp +++ b/Marlin/src/module/planner.cpp @@ -2230,21 +2230,13 @@ bool Planner::_populate_block(block_t * const block, bool split_move, already calculated in a different place. */ // Unit vector of previous path line segment - static float previous_unit_vec[ - #if ENABLED(JUNCTION_DEVIATION_INCLUDE_E) - XYZE - #else - XYZ - #endif - ]; + static float previous_unit_vec[XYZE]; float unit_vec[] = { delta_mm[A_AXIS] * inverse_millimeters, delta_mm[B_AXIS] * inverse_millimeters, - delta_mm[C_AXIS] * inverse_millimeters - #if ENABLED(JUNCTION_DEVIATION_INCLUDE_E) - , delta_mm[E_AXIS] * inverse_millimeters - #endif + delta_mm[C_AXIS] * inverse_millimeters, + delta_mm[E_AXIS] * inverse_millimeters }; // Skip first block or when previous_nominal_speed is used as a flag for homing and offset cycles. @@ -2254,9 +2246,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move, float junction_cos_theta = -previous_unit_vec[X_AXIS] * unit_vec[X_AXIS] -previous_unit_vec[Y_AXIS] * unit_vec[Y_AXIS] -previous_unit_vec[Z_AXIS] * unit_vec[Z_AXIS] - #if ENABLED(JUNCTION_DEVIATION_INCLUDE_E) - -previous_unit_vec[E_AXIS] * unit_vec[E_AXIS] - #endif + -previous_unit_vec[E_AXIS] * unit_vec[E_AXIS] ; // NOTE: Computed without any expensive trig, sin() or acos(), by trig half angle identity of cos(theta). @@ -2267,15 +2257,13 @@ bool Planner::_populate_block(block_t * const block, bool split_move, else { NOLESS(junction_cos_theta, -0.999999); // Check for numerical round-off to avoid divide by zero. - float junction_unit_vec[JD_AXES] = { + // Convert delta vector to unit vector + float junction_unit_vec[XYZE] = { unit_vec[X_AXIS] - previous_unit_vec[X_AXIS], unit_vec[Y_AXIS] - previous_unit_vec[Y_AXIS], - unit_vec[Z_AXIS] - previous_unit_vec[Z_AXIS] - #if ENABLED(JUNCTION_DEVIATION_INCLUDE_E) - , unit_vec[E_AXIS] - previous_unit_vec[E_AXIS] - #endif + unit_vec[Z_AXIS] - previous_unit_vec[Z_AXIS], + unit_vec[E_AXIS] - previous_unit_vec[E_AXIS] }; - // Convert delta vector to unit vector normalize_junction_vector(junction_unit_vec); const float junction_acceleration = limit_value_by_axis_maximum(block->acceleration, junction_unit_vec), diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h index e799cbb30e..96382014cb 100644 --- a/Marlin/src/module/planner.h +++ b/Marlin/src/module/planner.h @@ -830,22 +830,16 @@ class Planner { #if ENABLED(JUNCTION_DEVIATION) - #if ENABLED(JUNCTION_DEVIATION_INCLUDE_E) - #define JD_AXES XYZE - #else - #define JD_AXES XYZ - #endif - - FORCE_INLINE static void normalize_junction_vector(float (&vector)[JD_AXES]) { + FORCE_INLINE static void normalize_junction_vector(float (&vector)[XYZE]) { float magnitude_sq = 0.0; - for (uint8_t idx = 0; idx < JD_AXES; idx++) if (vector[idx]) magnitude_sq += sq(vector[idx]); + LOOP_XYZE(idx) if (vector[idx]) magnitude_sq += sq(vector[idx]); const float inv_magnitude = 1.0 / SQRT(magnitude_sq); - for (uint8_t idx = 0; idx < JD_AXES; idx++) vector[idx] *= inv_magnitude; + LOOP_XYZE(idx) vector[idx] *= inv_magnitude; } - FORCE_INLINE static float limit_value_by_axis_maximum(const float &max_value, float (&unit_vec)[JD_AXES]) { + FORCE_INLINE static float limit_value_by_axis_maximum(const float &max_value, float (&unit_vec)[XYZE]) { float limit_value = max_value; - for (uint8_t idx = 0; idx < JD_AXES; idx++) if (unit_vec[idx]) // Avoid divide by zero + LOOP_XYZE(idx) if (unit_vec[idx]) // Avoid divide by zero NOMORE(limit_value, ABS(max_acceleration_mm_per_s2[idx] / unit_vec[idx])); return limit_value; }