MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Add JD_HANDLE_SMALL_SEGMENTS option (#18316)

Browse Source
This commit is contained in:
XDA-Bam 2020-06-16 01:54:00 +02:00 committed by GitHub
parent aea60d9450
commit a4b46eaf8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 76 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Configuration.h
View File

@ -815,6 +815,8 @@
*/ */
#if DISABLED(CLASSIC_JERK) #if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.013 // (mm) Distance from real junction edge #define JUNCTION_DEVIATION_MM 0.013 // (mm) Distance from real junction edge
#define JD_HANDLE_SMALL_SEGMENTS // Use curvature estimation instead of just the junction angle
// for small segments (< 1mm) with large junction angles (> 135°).
#endif #endif
/** /**

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

@ -2352,6 +2352,8 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
vmax_junction_sqr = junction_acceleration * junction_deviation_mm * sin_theta_d2 / (1.0f - sin_theta_d2); vmax_junction_sqr = junction_acceleration * junction_deviation_mm * sin_theta_d2 / (1.0f - sin_theta_d2);
#if ENABLED(JD_HANDLE_SMALL_SEGMENTS)
// For small moves with >135° junction (octagon) find speed for approximate arc // For small moves with >135° junction (octagon) find speed for approximate arc
if (block->millimeters < 1 && junction_cos_theta < -0.7071067812f) { if (block->millimeters < 1 && junction_cos_theta < -0.7071067812f) {
@ -2435,6 +2437,8 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
const float limit_sqr = (block->millimeters * junction_acceleration) / junction_theta; const float limit_sqr = (block->millimeters * junction_acceleration) / junction_theta;
NOMORE(vmax_junction_sqr, limit_sqr); NOMORE(vmax_junction_sqr, limit_sqr);
} }
#endif // JD_HANDLE_SMALL_SEGMENTS
} }
// Get the lowest speed // Get the lowest speed

2
Marlin/src/module/planner.h
View File

@ -32,7 +32,7 @@
#include "../MarlinCore.h" #include "../MarlinCore.h"
#if HAS_JUNCTION_DEVIATION #if ENABLED(JD_HANDLE_SMALL_SEGMENTS)
// Enable this option for perfect accuracy but maximum // Enable this option for perfect accuracy but maximum
// computation. Should be fine on ARM processors. // computation. Should be fine on ARM processors.
//#define JD_USE_MATH_ACOS //#define JD_USE_MATH_ACOS