From 7da85eb0a6d659885b4a16fce7a0ba15ecbe0e39 Mon Sep 17 00:00:00 2001 From: FormerLurker Date: Fri, 27 Nov 2020 18:20:29 -0600 Subject: Fix Python unicode logging issues. Add sin approximation to inverse processor. Fix log levels and progress output. Add firmware compensation statistics. --- ArcWelderTest/ArcWelderTest.cpp | 9 ++++++--- ArcWelderTest/ArcWelderTest.h | 5 +++++ 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'ArcWelderTest') diff --git a/ArcWelderTest/ArcWelderTest.cpp b/ArcWelderTest/ArcWelderTest.cpp index b121d05..4b893cb 100644 --- a/ArcWelderTest/ArcWelderTest.cpp +++ b/ArcWelderTest/ArcWelderTest.cpp @@ -237,7 +237,7 @@ static void TestAntiStutter(std::string filePath) //double max_resolution = 1; double max_radius_mm = DEFAULT_MAX_RADIUS_MM; //int min_arc_segments = DEFAULT_MIN_ARC_SEGMENTS; - int min_arc_segments = 12; + int min_arc_segments = 24; double mm_per_arc_segment = 1; double path_tolerance_percent = ARC_LENGTH_PERCENT_TOLERANCE_DEFAULT; // 1 percent @@ -253,11 +253,12 @@ static void TestAntiStutter(std::string filePath) logger_levels.push_back(log_levels::ERROR); logger_levels.push_back(log_levels::CRITICAL); logger* p_logger = new logger(logger_names, logger_levels); - p_logger->set_log_level(INFO); + //p_logger->set_log_level(INFO); + p_logger->set_log_level_by_value(5); //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(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_L1_DIFFICULT, + BENCHY_MIN_RADIUS_TEST, "C:\\Users\\Brad\\Documents\\3DPrinter\\AntiStutter\\test_output.gcode", p_logger, max_resolution, @@ -269,6 +270,8 @@ static void TestAntiStutter(std::string filePath) true, DEFAULT_GCODE_BUFFER_SIZE, on_progress); + //FIRMWARE_COMPENSATION_TEST_1 + //BENCHY_MIN_RADIUS_TEST //BENCHY_DIFFICULT //BENCHY_LAYER_1GCODE //SMALL_TEST diff --git a/ArcWelderTest/ArcWelderTest.h b/ArcWelderTest/ArcWelderTest.h index 90ed99a..ea3fdf9 100644 --- a/ArcWelderTest/ArcWelderTest.h +++ b/ArcWelderTest/ArcWelderTest.h @@ -86,5 +86,10 @@ static std::string SPIRAL_VASE_TEST_CYLINDER = "C:\\Users\\Brad\\Documents\\3DPr static std::string SPIRAL_VASE_TEST_SINGLE_LAYER_CYLINDER = "C:\\Users\\Brad\\Documents\\3DPrinter\\AntiStutter\\SpiralVaseTest\\SpiralVaseSingleLayer_Cylinder.gcode"; static std::string SPIRAL_VASE_TEST_PI_BOWL = "C:\\Users\\Brad\\Documents\\3DPrinter\\AntiStutter\\SpiralVaseTest\\SpiralVaseTest_PiBowl.gcode"; +static std::string FIRMWARE_COMPENSATION_TEST_1 = "C:\\Users\\Brad\\Documents\\3DPrinter\\AntiStutter\\cylinder_tests\\cylinder_test_0.1_5.0_0.1.gcode"; +static std::string BENCHY_MIN_RADIUS_TEST = "C:\\Users\\Brad\\Documents\\3DPrinter\\AntiStutter\\BenchyMinRadiusTest.gcode"; + + + -- cgit v1.2.3