zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

🐛 Fix G2/G3 Arcs stutter / JD speed (#24362)

Browse source
This commit is contained in:
tombrazier 2022-06-18 05:17:12 +01:00 committed by Scott Lahteine
parent ae8365a4e5
commit 1efe48ef65
1 changed files with 93 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
Marlin/src/gcode/motion/G2_G3.cpp
View file

@ -179,8 +179,8 @@ void plan_arc(
// Feedrate for the move, scaled by the feedrate multiplier // Feedrate for the move, scaled by the feedrate multiplier
const feedRate_t scaled_fr_mm_s = MMS_SCALED(feedrate_mm_s); const feedRate_t scaled_fr_mm_s = MMS_SCALED(feedrate_mm_s);
// Get the nominal segment length based on settings // Get the ideal segment length for the move based on settings
const float nominal_segment_mm = ( const float ideal_segment_mm = (
#if ARC_SEGMENTS_PER_SEC // Length based on segments per second and feedrate #if ARC_SEGMENTS_PER_SEC // Length based on segments per second and feedrate
constrain(scaled_fr_mm_s * RECIPROCAL(ARC_SEGMENTS_PER_SEC), MIN_ARC_SEGMENT_MM, MAX_ARC_SEGMENT_MM) constrain(scaled_fr_mm_s * RECIPROCAL(ARC_SEGMENTS_PER_SEC), MIN_ARC_SEGMENT_MM, MAX_ARC_SEGMENT_MM)
#else #else
@ -188,19 +188,18 @@ void plan_arc(
#endif #endif
); );
// Number of whole segments based on the nominal segment length // Number of whole segments based on the ideal segment length
const float nominal_segments = _MAX(FLOOR(flat_mm / nominal_segment_mm), min_segments); const float nominal_segments = _MAX(FLOOR(flat_mm / ideal_segment_mm), min_segments),
nominal_segment_mm = flat_mm / nominal_segments;
// A new segment length based on the required minimum // The number of whole segments in the arc, with best attempt to honor MIN_ARC_SEGMENT_MM and MAX_ARC_SEGMENT_MM
const float segment_mm = constrain(flat_mm / nominal_segments, MIN_ARC_SEGMENT_MM, MAX_ARC_SEGMENT_MM); const uint16_t segments = nominal_segment_mm > (MAX_ARC_SEGMENT_MM) ? CEIL(flat_mm / (MAX_ARC_SEGMENT_MM)) :
nominal_segment_mm < (MIN_ARC_SEGMENT_MM) ? _MAX(1, FLOOR(flat_mm / (MIN_ARC_SEGMENT_MM))) :
nominal_segments;
// The number of whole segments in the arc, ignoring the remainder #if ENABLED(SCARA_FEEDRATE_SCALING)
uint16_t segments = FLOOR(flat_mm / segment_mm); const float inv_duration = (scaled_fr_mm_s / flat_mm) * segments;
#endif
// Are the segments now too few to reach the destination?
const float segmented_length = segment_mm * segments;
const bool tooshort = segmented_length < flat_mm - 0.0001f;
const float proportion = tooshort ? segmented_length / flat_mm : 1.0f;
/** /**
* Vector rotation by transformation matrix: r is the original vector, r_T is the rotated vector, * Vector rotation by transformation matrix: r is the original vector, r_T is the rotated vector,
@ -228,26 +227,27 @@ void plan_arc(
* a correction, the planner should have caught up to the lag caused by the initial plan_arc overhead. * a correction, the planner should have caught up to the lag caused by the initial plan_arc overhead.
* This is important when there are successive arc motions. * This is important when there are successive arc motions.
*/ */
// Vector rotation matrix values
xyze_pos_t raw; xyze_pos_t raw;
const float theta_per_segment = proportion * angular_travel / segments,
// do not calculate rotation parameters for trivial single-segment arcs
if (segments > 1) {
// Vector rotation matrix values
const float theta_per_segment = angular_travel / segments,
sq_theta_per_segment = sq(theta_per_segment), sq_theta_per_segment = sq(theta_per_segment),
sin_T = theta_per_segment - sq_theta_per_segment * theta_per_segment / 6, sin_T = theta_per_segment - sq_theta_per_segment * theta_per_segment / 6,
cos_T = 1 - 0.5f * sq_theta_per_segment; // Small angle approximation cos_T = 1 - 0.5f * sq_theta_per_segment; // Small angle approximation
#if DISABLED(AUTO_BED_LEVELING_UBL) #if DISABLED(AUTO_BED_LEVELING_UBL)
ARC_LIJK_CODE( ARC_LIJK_CODE(
const float per_segment_L = proportion * travel_L / segments, const float per_segment_L = travel_L / segments,
const float per_segment_I = proportion * travel_I / segments, const float per_segment_I = travel_I / segments,
const float per_segment_J = proportion * travel_J / segments, const float per_segment_J = travel_J / segments,
const float per_segment_K = proportion * travel_K / segments const float per_segment_K = travel_K / segments
); );
#endif #endif
CODE_ITEM_E(const float extruder_per_segment = proportion * travel_E / segments); CODE_ITEM_E(const float extruder_per_segment = travel_E / segments);
// For shortened segments, run all but the remainder in the loop
if (tooshort) segments++;
// Initialize all linear axes and E // Initialize all linear axes and E
ARC_LIJKE_CODE( ARC_LIJKE_CODE(
@ -258,10 +258,6 @@ void plan_arc(
raw.e = current_position.e raw.e = current_position.e
); );
#if ENABLED(SCARA_FEEDRATE_SCALING)
const float inv_duration = scaled_fr_mm_s / segment_mm;
#endif
millis_t next_idle_ms = millis() + 200UL; millis_t next_idle_ms = millis() + 200UL;
#if N_ARC_CORRECTION > 1 #if N_ARC_CORRECTION > 1
@ -305,9 +301,11 @@ void plan_arc(
raw[axis_q] = center_Q + rvec.b; raw[axis_q] = center_Q + rvec.b;
ARC_LIJKE_CODE( ARC_LIJKE_CODE(
#if ENABLED(AUTO_BED_LEVELING_UBL) #if ENABLED(AUTO_BED_LEVELING_UBL)
raw[axis_l] = start_L, raw.i = start_I, raw.j = start_J, raw.k = start_K raw[axis_l] = start_L,
raw.i = start_I, raw.j = start_J, raw.k = start_K
#else #else
raw[axis_l] += per_segment_L, raw.i += per_segment_I, raw.j += per_segment_J, raw.k += per_segment_K raw[axis_l] += per_segment_L,
raw.i += per_segment_I, raw.j += per_segment_J, raw.k += per_segment_K
#endif #endif
, raw.e += extruder_per_segment , raw.e += extruder_per_segment
); );
@ -321,6 +319,7 @@ void plan_arc(
if (!planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, 0 OPTARG(SCARA_FEEDRATE_SCALING, inv_duration))) if (!planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, 0 OPTARG(SCARA_FEEDRATE_SCALING, inv_duration)))
break; break;
} }
}
// Ensure last segment arrives at target location. // Ensure last segment arrives at target location.
raw = cart; raw = cart;