Rename Junction Deviation options
This commit is contained in:
parent
aaaf09bda2
commit
931ab4ec40
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue