From 9d1d644013ea74e89ac81f42006b115474cf955e Mon Sep 17 00:00:00 2001 From: FormerLurker Date: Thu, 25 Nov 2021 13:36:18 -0600 Subject: Clean up error correction and debug parameters for the console applications. Update readme.md. --- ArcWelder/arc_welder.cpp | 7 +++++-- ArcWelder/arc_welder.h | 26 ++++++++++++++++++++++---- 2 files changed, 27 insertions(+), 6 deletions(-) (limited to 'ArcWelder') diff --git a/ArcWelder/arc_welder.cpp b/ArcWelder/arc_welder.cpp index 2103763..e9a9ddd 100644 --- a/ArcWelder/arc_welder.cpp +++ b/ArcWelder/arc_welder.cpp @@ -981,8 +981,11 @@ void arc_welder::add_arcwelder_comment_to_target() } stream << "; default_xyz_precision=" << std::setprecision(0) << static_cast(current_arc_.get_xyz_precision()) << "\n"; stream << "; default_e_precision=" << std::setprecision(0) << static_cast(current_arc_.get_e_precision()) << "\n"; - stream << "; extrusion_rate_variance_percent=" << std::setprecision(1) << (extrusion_rate_variance_percent_ * 100.0) << "%\n\n"; - + if (extrusion_rate_variance_percent_ > 0) + { + stream << "; extrusion_rate_variance=" << std::setprecision(1) << (extrusion_rate_variance_percent_ * 100.0) << "%\n"; + } + stream << "\n"; output_file_ << stream.str(); } diff --git a/ArcWelder/arc_welder.h b/ArcWelder/arc_welder.h index ec07e7d..7535bf0 100644 --- a/ArcWelder/arc_welder.h +++ b/ArcWelder/arc_welder.h @@ -44,6 +44,8 @@ #define _CRT_SECURE_NO_WARNINGS #endif +#define ARC_WELDER_INFO_STRING "Arc Welder: Anti-Stutter\nConverts G0/G1 commands to G2/G3 (arc) commands. Reduces the number of gcodes per second sent to a 3D printer, which can reduce stuttering."; + static const int segment_statistic_lengths_count = 12; const double segment_statistic_lengths[] = { 0.002f, 0.005f, 0.01f, 0.05f, 0.1f, 0.5f, 1.0f, 5.0f, 10.0f, 20.0f, 50.0f, 100.0f }; @@ -623,15 +625,31 @@ struct arc_welder_args } stream << "\tResolution : " << resolution_mm << "mm (+-" << std::setprecision(5) << resolution_mm / 2.0 << "mm)\n"; stream << "\tPath Tolerance : " << std::setprecision(3) << path_tolerance_percent * 100.0 << "%\n"; - stream << "\tMaximum Arc Radius : " << std::setprecision(0) << max_radius_mm << "mm\n"; - stream << "\tMin Arc Segments : " << std::setprecision(0) << min_arc_segments << "\n"; - stream << "\tMM Per Arc Segment : " << std::setprecision(3) << mm_per_arc_segment << "\n"; + stream << "\tMaximum Arc Radius : " << std::setprecision(1) << max_radius_mm << "mm\n"; + bool firmware_compensation_enabled = min_arc_segments > 0 && mm_per_arc_segment > 0.0; + stream << "\tFirmware Compensation : " << (firmware_compensation_enabled ? "True" : "False") << "\n"; + if (firmware_compensation_enabled) + { + stream << "\tMin Arc Segments : " << std::setprecision(0) << min_arc_segments << "\n"; + stream << "\tMM Per Arc Segment : " << std::setprecision(3) << mm_per_arc_segment << "\n"; + } + stream << "\tAllow 3D Arcs : " << (allow_3d_arcs ? "True" : "False") << "\n"; stream << "\tAllow Travel Arcs : " << (allow_travel_arcs ? "True" : "False") << "\n"; stream << "\tAllow Dynamic Precision : " << (allow_dynamic_precision ? "True" : "False") << "\n"; stream << "\tDefault XYZ Precision : " << std::setprecision(0) << static_cast(default_xyz_precision) << "\n"; stream << "\tDefault E Precision : " << std::setprecision(0) << static_cast(default_e_precision) << "\n"; - stream << "\tExtrusion Rate Variance % : " << std::setprecision(3) << extrusion_rate_variance_percent * 100.0 << "%\n"; + stream << "\tExtrusion Rate Variance : "; + if (extrusion_rate_variance_percent == 0) + { + stream << "Unlimited"; + } + else + { + stream << extrusion_rate_variance_percent * 100.0 << "%"; + } + stream << "\n"; + stream << "\tG90/G91 Influences Extruder : " << (g90_g91_influences_extruder ? "True" : "False") << "\n"; if (max_gcode_length == 0) { -- cgit v1.2.3