SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Rename Junction Deviation options

Browse source
This commit is contained in:
Scott Lahteine 2018-05-26 02:19:28 -05:00
parent aaaf09bda2
commit 931ab4ec40
52 changed files with 106 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/default/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/Anet/A6/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/Anet/A8/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/Cartesio/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/Felix/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/MakerParts/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/Malyan/M150/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/Malyan/M200/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/RigidBot/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/SCARA/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/Sanguinololu/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/TheBorg/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/TinyBoy2/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h
View file

@ -449,8 +449,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h
View file

@ -448,8 +448,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h
View file

@ -448,8 +448,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h
View file

@ -448,8 +448,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/delta/generic/Configuration_adv.h
View file

@ -448,8 +448,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h
View file

@ -448,8 +448,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h
View file

@ -453,8 +453,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h
View file

@ -448,8 +448,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/makibox/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/config/examples/wt150/Configuration_adv.h
View file

@ -446,8 +446,8 @@
// //
//#define JUNCTION_DEVIATION //#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_FACTOR 0.05 #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#define JUNCTION_ACCELERATION_FACTOR 1000 #define JUNCTION_ACCELERATION 1000 // (mm/s²) Maximum centripetal acceleration
//#define JUNCTION_DEVIATION_INCLUDE_E //#define JUNCTION_DEVIATION_INCLUDE_E
#endif #endif

4
Marlin/src/inc/SanityCheck.h
View file

@ -275,6 +275,10 @@
#error "LEVEL_BED_CORNERS requires a LEVEL_CORNERS_INSET value. Please update your Configuration.h." #error "LEVEL_BED_CORNERS requires a LEVEL_CORNERS_INSET value. Please update your Configuration.h."
#elif defined(BEZIER_JERK_CONTROL) #elif defined(BEZIER_JERK_CONTROL)
#error "BEZIER_JERK_CONTROL is now S_CURVE_ACCELERATION. Please update your configuration." #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 #endif
#define BOARD_MKS_13 -47 #define BOARD_MKS_13 -47

4
Marlin/src/module/planner.cpp
View file

@ -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 // 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. // 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) { if (block->millimeters < 1.0) {
// Fast acos approximation, minus the error bar to be safe // 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 angle is greater than 135 degrees (octagon), find speed for approximate arc
if (junction_theta > RADIANS(135)) { 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); NOMORE(vmax_junction_sqr, limit_sqr);
} }
} }