diff options
author | FormerLurker <hochgebe@gmail.com> | 2020-05-17 01:17:15 +0300 |
---|---|---|
committer | FormerLurker <hochgebe@gmail.com> | 2020-05-17 01:17:15 +0300 |
commit | d201085f565ed498d218ece1783a5c76bcfdb25d (patch) | |
tree | aaa7304ecb0c89c0fdb5e4930e7db7a5897d907e /ArcWelderTest | |
parent | f98db3c33c4199eb966c45c9ab2e914b3a689ae1 (diff) |
Add max_radius_mm and switch to polar coordinates for arc generation.
Diffstat (limited to 'ArcWelderTest')
-rw-r--r-- | ArcWelderTest/ArcWelderTest.cpp | 6 | ||||
-rw-r--r-- | ArcWelderTest/ArcWelderTest.h | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/ArcWelderTest/ArcWelderTest.cpp b/ArcWelderTest/ArcWelderTest.cpp index 58585d0..97bd44d 100644 --- a/ArcWelderTest/ArcWelderTest.cpp +++ b/ArcWelderTest/ArcWelderTest.cpp @@ -230,7 +230,8 @@ static gcode_position_args get_5_extruder_position_args() static void TestAntiStutter(std::string filePath) { - double max_resolution = 0.05; + double max_resolution = DEFAULT_RESOLUTION_MM; + double max_radius_mm = DEFAULT_MAX_RADIUS_MM; std::vector<std::string> logger_names; logger_names.push_back("arc_welder.gcode_conversion"); std::vector<int> logger_levels; @@ -240,7 +241,7 @@ static void TestAntiStutter(std::string filePath) p_logger->set_log_level(INFO); //arc_welder arc_welder_obj(BENCHY_0_5_MM_NO_WIPE, "C:\\Users\\Brad\\Documents\\3DPrinter\\AntiStutter\\test_output.gcode", p_logger, max_resolution, false, 50, static_cast<progress_callback>(on_progress)); //arc_welder arc_welder_obj(SIX_SPEED_TEST, "C:\\Users\\Brad\\Documents\\3DPrinter\\AntiStutter\\test_output.gcode", p_logger, max_resolution, false, 50, on_progress); - arc_welder arc_welder_obj(BENCHY_GYROID_ABSOLUTE_E_NOWIPE, "C:\\Users\\Brad\\Documents\\3DPrinter\\AntiStutter\\test_output.gcode", p_logger, max_resolution, false, 50, on_progress); + arc_welder arc_welder_obj(BENCHY_GYROID_RELATIVE_E_NOWIPE, "C:\\Users\\Brad\\Documents\\3DPrinter\\AntiStutter\\test_output.gcode", p_logger, max_resolution, max_radius_mm, false, 50, on_progress); //BENCHY_LAYER_1GCODE //SMALL_TEST //FACE_SHIELD @@ -257,6 +258,7 @@ static void TestAntiStutter(std::string filePath) //ORCHID_POD //DIFFICULT_CURVES //ISSUE_PRICKLYPEAR_LAYER_0_114 + //BARBARIAN arc_welder_obj.process(); p_logger->log(0, INFO, "Processing Complete."); delete p_logger; diff --git a/ArcWelderTest/ArcWelderTest.h b/ArcWelderTest/ArcWelderTest.h index 9b5c3ea..d14e993 100644 --- a/ArcWelderTest/ArcWelderTest.h +++ b/ArcWelderTest/ArcWelderTest.h @@ -69,5 +69,8 @@ static std::string ARC_GYROID_BENCHY_DIFFICULT = "C:\\Users\\Brad\\Documents\\3D static std::string SIX_SPEED_TEST = "C:\\Users\\Brad\\Documents\\3DPrinter\\AntiStutter\\6_speed_test.gcode"; // Issues static std::string ISSUE_MIMUPREFERIDA = "C:\\Users\\Brad\\Documents\\AntiStutter\\Issues\\MIMUPREFERIDA\\TESTSTUTTER.gcode"; -static std::string ISSUE_PRICKLYPEAR = "C:\\Users\\Brad\\Documents\\AntiStutter\\Issues\\PricklyPear\\Barbarian.gcode"; +static std::string BARBARIAN = "C:\\Users\\Brad\\Documents\\AntiStutter\\Issues\\PricklyPear\\Barbarian.gcode"; static std::string ISSUE_PRICKLYPEAR_LAYER_0_114 = "C:\\Users\\Brad\\Documents\\AntiStutter\\Issues\\PricklyPear\\Layers0_114.gcode"; +// Sanity tests +static std::string COLINEAR_TEST_1 = "C:\\Users\\Brad\\Documents\\AntiStutter\\Sanity Checks\\G2_colinear_test.gcode"; + |