From cc0e1ce3c3e1752ee29c385e974e15bc98899347 Mon Sep 17 00:00:00 2001 From: Joe Marshall Date: Sat, 13 Jan 2024 08:22:34 +0000 Subject: [PATCH] mac tests should work now --- .../_Op_Parallel_Internal_Exact.gcode.mac | 90 ++++++++++--------- scripts/addons/cam/tests/test_suite.py | 5 +- 2 files changed, 51 insertions(+), 44 deletions(-) diff --git a/scripts/addons/cam/tests/test_data/parallel/_Op_Parallel_Internal_Exact.gcode.mac b/scripts/addons/cam/tests/test_data/parallel/_Op_Parallel_Internal_Exact.gcode.mac index 2fc7a901..1bc05388 100644 --- a/scripts/addons/cam/tests/test_data/parallel/_Op_Parallel_Internal_Exact.gcode.mac +++ b/scripts/addons/cam/tests/test_data/parallel/_Op_Parallel_Internal_Exact.gcode.mac @@ -1,4 +1,4 @@ -(Created with grbl post processor 2024/01/13 06:54) +(Created with grbl post processor 2024/01/13 08:18) G21 (G-code generated with BlenderCAM and NC library) G17G90 @@ -517,14 +517,14 @@ G1Z-3.1F500 Y51.106Z-6.1 Y-51.108F1000 Y-51.597Z-3.1 -G0Z2 X-42Y-53.563 -G1Z-3.1F500 -Y-53.102Z-6.1 +Y-53.102Z-6.1F500 Y53.1F1000 Y53.551Z-3.1 +G0Z2 X-40Y54.609 -Y54.111Z-6.1F500 +G1Z-3.1F500 +Y54.111Z-6.1 Y-54.118F1000 Y-54.651Z-3.1 X-38Y-56.56 @@ -536,10 +536,8 @@ G1Z-3.1F500 Y57.103Z-6.1 Y-57.107F1000 Y-57.589Z-3.1 -G0Z2 X-34Y-58.64 -G1Z-3.1F500 -Y-58.116Z-6.1 +Y-58.116Z-6.1F500 Y58.108F1000 Y58.593Z-3.1 G0Z2 @@ -568,10 +566,8 @@ G1Z-3.1F500 Y-64.104Z-6.1 Y64.1F1000 Y64.55Z-3.1 -G0Z2 X-20Y64.647 -G1Z-3.1F500 -Y64.118Z-6.1 +Y64.118Z-6.1F500 Y-65.1F1000 Y-65.55Z-3.1 X-18Y-65.62 @@ -583,10 +579,8 @@ X-16Y66 G1Z-6.1F500 Y-66.102F1000 Y-66.56Z-3.1 -G0Z2 X-14Y-66.632 -G1Z-3.1F500 -Y-66.115Z-6.1 +Y-66.115Z-6.1F500 Y66.104F1000 Y66.57Z-3.1 G0Z2 @@ -643,8 +637,10 @@ G1Z-3.1F500 Y67.116Z-6.1 Y-67.109F1000 Y-67.599Z-3.1 +G0Z2 X10Y-67.574 -Y-67.104Z-6.1F500 +G1Z-3.1F500 +Y-67.104Z-6.1 Y67.106F1000 Y67.583Z-3.1 X12Y67.558 @@ -663,8 +659,10 @@ G1Z-3.1F500 Y66.106Z-6.1 Y-66.102F1000 Y-66.562Z-3.1 +G0Z2 X18Y-65.588 -Y-65.107Z-6.1F500 +G1Z-3.1F500 +Y-65.107Z-6.1 Y65.118F1000 Y65.65Z-3.1 X20Y65.574 @@ -677,16 +675,20 @@ G1Z-3.1F500 Y-64.103Z-6.1 Y64.109F1000 Y64.599Z-3.1 +G0Z2 X24Y63.632 -Y63.115Z-6.1F500 +G1Z-3.1F500 +Y63.115Z-6.1 Y-63.106F1000 Y-63.584Z-3.1 X26Y-62.606 Y-62.11Z-6.1F500 Y63.102F1000 Y63.563Z-3.1 +G0Z2 X28Y62.567 -Y62.103Z-6.1F500 +G1Z-3.1F500 +Y62.103Z-6.1 Y-61.114F1000 Y-61.627Z-3.1 G0Z2 @@ -695,20 +697,18 @@ G1Z-3.1F500 Y-60.115Z-6.1 Y61.103F1000 Y61.567Z-3.1 -G0Z2 X32Y60.565 -G1Z-3.1F500 -Y60.103Z-6.1 +Y60.103Z-6.1F500 Y-59.114F1000 Y-59.628Z-3.1 +G0Z2 X34Y-58.603 -Y-58.109Z-6.1F500 +G1Z-3.1F500 +Y-58.109Z-6.1 Y58.121F1000 Y58.663Z-3.1 -G0Z2 X36Y57.608 -G1Z-3.1F500 -Y57.111Z-6.1 +Y57.111Z-6.1F500 Y-57.105F1000 Y-57.578Z-3.1 G0Z2 @@ -721,20 +721,18 @@ X40Y54.668 Y54.122Z-6.1F500 Y-54.111F1000 Y-54.613Z-3.1 -G0Z2 X42Y-53.563 -G1Z-3.1F500 -Y-53.102Z-6.1 +Y-53.102Z-6.1F500 Y53.106F1000 Y53.581Z-3.1 -G0Z2 X44Y51.612 -G1Z-3.1F500 -Y51.111Z-6.1 +Y51.111Z-6.1F500 Y-51.107F1000 Y-51.587Z-3.1 +G0Z2 X46Y-49.631 -Y-49.115Z-6.1F500 +G1Z-3.1F500 +Y-49.115Z-6.1 Y49.12F1000 Y49.658Z-3.1 X48Y48.564 @@ -749,18 +747,20 @@ X52Y43.597 Y43.109Z-6.1F500 Y-43.106F1000 Y-43.584Z-3.1 +G0Z2 X54Y-41.557 -Y-41.101Z-6.1F500 +G1Z-3.1F500 +Y-41.101Z-6.1 Y41.103F1000 Y41.566Z-3.1 +G0Z2 X56Y38.577 -Y38.105Z-6.1F500 +G1Z-3.1F500 +Y38.105Z-6.1 Y-38.103F1000 Y-38.566Z-3.1 -G0Z2 X58Y-35.563 -G1Z-3.1F500 -Y-35.102Z-6.1 +Y-35.102Z-6.1F500 Y35.104F1000 Y35.573Z-3.1 X60Y31.614 @@ -932,10 +932,8 @@ G1Z-6.1F500 Y67Z-6.769 Y-66.999F1000 Y-67.107Z-6.1 -G0Z2 X-8Y-67.121 -G1Z-6.1F500 -Y-66.999Z-6.769 +Y-66.999Z-6.769F500 Y67F1000 Y67.105Z-6.1 X-6Y67.113 @@ -969,8 +967,10 @@ X10Y67.106 Y67Z-6.769F500 Y-66.999F1000 Y-67.104Z-6.1 +G0Z2 X12Y-67.101 -Y-66.999Z-6.769F500 +G1Z-6.1F500 +Y-66.999Z-6.769 Y67F1000 Y67.102Z-6.1 X14Y66.121 @@ -1059,12 +1059,16 @@ X52Y-43.106 Y-42.999Z-6.769F500 Y43F1000 Y43.109Z-6.1 +G0Z2 X54Y41.103 -Y41Z-6.769F500 +G1Z-6.1F500 +Y41Z-6.769 Y-40.999F1000 Y-41.101Z-6.1 +G0Z2 X56Y-38.103 -Y-37.999Z-6.769F500 +G1Z-6.1F500 +Y-37.999Z-6.769 Y38F1000 Y38.105Z-6.1 X58Y35.104 diff --git a/scripts/addons/cam/tests/test_suite.py b/scripts/addons/cam/tests/test_suite.py index 11c5a155..f1ab01f1 100644 --- a/scripts/addons/cam/tests/test_suite.py +++ b/scripts/addons/cam/tests/test_suite.py @@ -68,6 +68,9 @@ class BlenderCAMTest(unittest.TestCase): generated = self.get_gcode_from_file(gcode_file[1:]) expected = self.get_gcode_from_file(gcode_file) if sys.platform=='darwin' and os.path.exists(gcode_file+".mac"): + # bullet physics gives slightly different results on mac sometimes... + # this is something we can't fix, so compare against mac generated test + # file print("Using mac test file",len(expected),len(generated)) expected = self.get_gcode_from_file(gcode_file+".mac") self.assertMultiLineEqual(generated, expected, @@ -75,7 +78,7 @@ class BlenderCAMTest(unittest.TestCase): else: self.assertMultiLineEqual(generated, expected, msg = "\n"+self.get_diff(gcode_file[1:], gcode_file)) -# os.remove(gcode_file[1:]) # cleanup generated file unless test fails + os.remove(gcode_file[1:]) # cleanup generated file unless test fails if __name__ == '__main__': # Add a test method for each test case to the TestCase class