From 8cbd08c6c27bb792d28345d24ffc7a7765c35079 Mon Sep 17 00:00:00 2001 From: FormerLurker Date: Mon, 30 Nov 2020 11:33:11 -0600 Subject: Replace current_arc when aborted via firmware compensation. --- ArcWelder/segmented_arc.cpp | 3 ++- ArcWelder/segmented_shape.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'ArcWelder') diff --git a/ArcWelder/segmented_arc.cpp b/ArcWelder/segmented_arc.cpp index 9f02049..c92809f 100644 --- a/ArcWelder/segmented_arc.cpp +++ b/ArcWelder/segmented_arc.cpp @@ -209,7 +209,7 @@ bool segmented_arc::try_add_point_internal_(point p, double pd) points_.push_back(p); double previous_shape_length = original_shape_length_; original_shape_length_ += pd; - + arc original_arc = current_arc_; if (arc::try_create_arc(points_, current_arc_, original_shape_length_, max_radius_mm_, resolution_mm_, path_tolerance_percent_, min_arc_segments_, mm_per_arc_segment_, xyz_precision_, allow_3d_arcs_)) { // See how many arcs will be interpolated @@ -223,6 +223,7 @@ bool segmented_arc::try_add_point_internal_(point p, double pd) num_segments = (int)std::floor(circumference / original_shape_length_); if (num_segments < min_arc_segments_) { firmware_corrected = true; + current_arc_ = original_arc; num_firmware_compensations_++; } } diff --git a/ArcWelder/segmented_shape.cpp b/ArcWelder/segmented_shape.cpp index d9041eb..65995b4 100644 --- a/ArcWelder/segmented_shape.cpp +++ b/ArcWelder/segmented_shape.cpp @@ -410,7 +410,7 @@ bool arc::try_create_arc( // We may be traveling in 3 space, calculate the arc_length of the spiral if (start_point.z != end_point.z) { - test_arc_length = utilities::hypot(arc_length, end_point.z - start_point.z); + test_arc_length = utilities::hypot(test_arc_length, end_point.z - start_point.z); } } difference = (test_arc_length - approximate_length) / approximate_length; -- cgit v1.2.3