From cd5609c65946ba996e6fede18ef19fe5ac233d74 Mon Sep 17 00:00:00 2001 From: Joe Marshall Date: Fri, 26 Jan 2024 12:00:58 +0000 Subject: [PATCH] test file fixes --- .../parallel/_Op_Parallel_Internal.gcode | 1259 +++++++---------- .../_Op_Parallel_Internal_Exact.gcode | 98 +- 2 files changed, 529 insertions(+), 828 deletions(-) diff --git a/scripts/addons/cam/tests/test_data/parallel/_Op_Parallel_Internal.gcode b/scripts/addons/cam/tests/test_data/parallel/_Op_Parallel_Internal.gcode index 7184b278..c7ba73ef 100644 --- a/scripts/addons/cam/tests/test_data/parallel/_Op_Parallel_Internal.gcode +++ b/scripts/addons/cam/tests/test_data/parallel/_Op_Parallel_Internal.gcode @@ -1,4 +1,4 @@ -(Created with grbl post processor 2024/01/11 10:02) +(Created with grbl post processor 2024/01/26 11:54) G21 (G-code generated with BlenderCAM and NC library) G17G90 @@ -7,804 +7,505 @@ S12000M03 G00 Z2.0 G0X0Y0Z2 -X-98Y99 +X-68Y-7.999 G1Z-3.1F500 -Y-99.999F1000 -X-96 -Y99 -X-94 -Y-99.999 -X-92 -Y99 -X-90 -Y-99.999 -X-88 -Y99 -X-86 -Y-99.999 -X-84 -Y99 -X-82 -Y-99.999 -X-80 -Y99 -X-78 -Y-99.999 -X-76 -Y99 -X-74 -Y-99.999 -X-72 -Y99 -X-70 -Y-99.999 -X-68 -Y99 -X-66 -Y-99.999 -X-64 -Y99 -X-62 -Y-99.999 -X-60 -Y99 -X-58 -Y-99.999 -X-56 -Y99 -X-54 -Y-99.999 -X-52 -Y99 -X-50 -Y-99.999 -X-48 -Y99 -X-46 -Y-99.999 -X-44 -Y99 -X-42 -Y-99.999 -X-40 -Y99 -X-38 -Y-99.999 -X-36 -Y99 -X-34 -Y-99.999 -X-32 -Y99 -X-30 -Y-99.999 -X-28 -Y99 -X-26 -Y-99.999 -X-24 -Y99 -X-22 -Y-99.999 -X-20 -Y99 -X-18 -Y-99.999 -X-16 -Y99 -X-14 -Y-99.999 -X-12 -Y99 -X-10 -Y-99.999 -X-8 -Y99 -X-6 -Y-99.999 -X-4 -Y99 -X-2 -Y-99.999 -X0 -Y99 -X2 -Y-99.999 -X4 -Y99 -X6 -Y-99.999 -X8 -Y99 -X10 -Y-99.999 -X12 -Y99 -X14 -Y-99.999 -X16 -Y99 -X18 -Y-99.999 -X20 -Y99 -X22 -Y-99.999 -X24 -Y99 -X26 -Y-99.999 -X28 -Y99 -X30 -Y-99.999 -X32 -Y99 -X34 -Y-99.999 -X36 -Y99 -X38 -Y-99.999 -X40 -Y99 -X42 -Y-99.999 -X44 -Y99 -X46 -Y-99.999 -X48 -Y99 -X50 -Y-99.999 -X52 -Y99 -X54 -Y-99.999 -X56 -Y99 -X58 -Y-99.999 -X60 -Y99 -X62 -Y-99.999 -X64 -Y99 -X66 -Y-99.999 -X68 -Y99 -X70 -Y-99.999 -X72 -Y99 -X74 -Y-99.999 -X76 -Y99 -X78 -Y-99.999 -X80 -Y99 -X82 -Y-99.999 -X84 -Y99 -X86 -Y-99.999 -X88 -Y99 -X90 -Y-99.999 -X92 -Y99 -X94 -Y-99.999 -X96 -Y99 -X98 -Y-99.999 +Y8F1000 G0Z2 -X-98 +X-66Y18 +G1Z-3.1F500 +Y-17.999F1000 +G0Z2 +X-64Y-23.999 +G1Z-3.1F500 +Y24F1000 +G0Z2 +X-62Y29 +G1Z-3.1F500 +Y-28.999F1000 +X-60Y-32.999 +Y33 +X-58Y36 +Y-35.999 +X-56Y-38.999 +Y39 +X-54Y42 +Y-41.999 +X-52Y-43.999 +Y44 +X-50Y46 +Y-45.999 +X-48Y-47.999 +Y48 +X-46Y50 +Y-49.999 +X-44Y-51.999 +Y52 +X-42Y54 +Y-53.999 +X-40Y-54.999 +Y55 +X-38Y56 +Y-55.999 +X-36Y-57.999 +Y58 +X-34Y59 +Y-58.999 +X-32Y-59.999 +Y60 +X-30Y61 +Y-60.999 +X-28Y-61.999 +Y62 +X-26Y63 +Y-62.999 +X-24Y-63.999 +Y64 +X-22 +Y-63.999 +X-20Y-64.999 +Y65 +X-18Y66 +Y-65.999 +X-16 +Y66 +X-14Y67 +Y-66.999 +X-12 +Y67 +X-10 +Y-66.999 +X-8Y-67.999 +Y68 +X-6 +Y-67.999 +X-4 +Y68 +X-2 +Y-67.999 +X0 +Y68 +X2 +Y-67.999 +X4 +Y68 +X6 +Y-67.999 +X8 +Y68 +X10Y67 +Y-66.999 +X12 +Y67 +X14 +Y-66.999 +X16Y-65.999 +Y66 +X18 +Y-65.999 +X20Y-64.999 +Y65 +X22Y64 +Y-63.999 +X24 +Y64 +X26Y63 +Y-62.999 +X28Y-61.999 +Y62 +X30Y61 +Y-60.999 +X32Y-59.999 +Y60 +X34Y59 +Y-58.999 +X36Y-57.999 +Y58 +X38Y56 +Y-55.999 +X40Y-54.999 +Y55 +X42Y54 +Y-53.999 +X44Y-51.999 +Y52 +X46Y50 +Y-49.999 +X48Y-47.999 +Y48 +X50Y46 +Y-45.999 +X52Y-43.999 +Y44 +X54Y42 +Y-41.999 +X56Y-38.999 +Y39 +X58Y36 +Y-35.999 +X60Y-32.999 +Y33 +X62Y29 +Y-28.999 +G0Z2 +X64Y-23.999 +G1Z-3.1F500 +Y24F1000 +G0Z2 +X66Y18 +G1Z-3.1F500 +Y-17.999F1000 +G0Z2 +X68Y-7.999 +G1Z-3.1F500 +Y8F1000 +G0Z2 +X-68 G1Z-6.1F500 -Y99F1000 -X-96 -Y-99.999 -X-94 -Y99 -X-92 -Y-99.999 -X-90 -Y99 -X-88 -Y-99.999 -X-86 -Y99 -X-84 -Y-99.999 -X-82 -Y99 -X-80 -Y-99.999 -X-78 -Y99 -X-76 -Y-99.999 -X-74 -Y99 -X-72 -Y-99.999 -X-70 -Y99 -X-68 -Y-99.999 -X-66 -Y99 -X-64 -Y-99.999 -X-62 -Y99 -X-60 -Y-99.999 -X-58 -Y99 -X-56 -Y-99.999 -X-54 -Y99 -X-52 -Y-99.999 -X-50 -Y99 -X-48 -Y-99.999 -X-46 -Y99 -X-44 -Y-99.999 -X-42 -Y99 -X-40 -Y-99.999 -X-38 -Y99 -X-36 -Y-99.999 -X-34 -Y99 -X-32 -Y-99.999 -X-30 -Y99 -X-28 -Y-99.999 -X-26 -Y99 -X-24 -Y-99.999 -X-22 -Y99 -X-20 -Y-99.999 -X-18 -Y99 -X-16 -Y-99.999 -X-14 -Y99 -X-12 -Y-99.999 -X-10 -Y99 -X-8 -Y-99.999 -X-6 -Y99 -X-4 -Y-99.999 -X-2 -Y99 -X0 -Y-99.999 -X2 -Y99 -X4 -Y-99.999 -X6 -Y99 -X8 -Y-99.999 -X10 -Y99 -X12 -Y-99.999 -X14 -Y99 -X16 -Y-99.999 -X18 -Y99 -X20 -Y-99.999 -X22 -Y99 -X24 -Y-99.999 -X26 -Y99 -X28 -Y-99.999 -X30 -Y99 -X32 -Y-99.999 -X34 -Y99 -X36 -Y-99.999 -X38 -Y99 -X40 -Y-99.999 -X42 -Y99 -X44 -Y-99.999 -X46 -Y99 -X48 -Y-99.999 -X50 -Y99 -X52 -Y-99.999 -X54 -Y99 -X56 -Y-99.999 -X58 -Y99 -X60 -Y-99.999 -X62 -Y99 -X64 -Y-99.999 -X66 -Y99 -X68 -Y-99.999 -X70 -Y99 -X72 -Y-99.999 -X74 -Y99 -X76 -Y-99.999 -X78 -Y99 -X80 -Y-99.999 -X82 -Y99 -X84 -Y-99.999 -X86 -Y99 -X88 -Y-99.999 -X90 -Y99 -X92 -Y-99.999 -X94 -Y99 -X96 -Y-99.999 -X98 -Y99 +Y-7.999F1000 G0Z2 -X-98 -G1Z-9.1F500 -Y-99.999F1000 -X-96 -Y99 -X-94 -Y-99.999 -X-92 -Y99 -X-90 -Y-99.999 -X-88 -Y99 -X-86 -Y-99.999 -X-84 -Y99 -X-82 -Y-99.999 -X-80 -Y99 -X-78 -Y-99.999 -X-76 -Y99 -X-74 -Y-99.999 -X-72 -Y99 -X-70 -Y-99.999 -X-68 -Y99 -X-66 -Y-99.999 -X-64 -Y99 -X-62 -Y-99.999 -X-60 -Y99 -X-58 -Y-99.999 -X-56 -Y99 -X-54 -Y-99.999 -X-52 -Y99 -X-50 -Y-99.999 -X-48 -Y99 -X-46 -Y-99.999 -X-44 -Y99 -X-42 -Y-99.999 -X-40 -Y99 -X-38 -Y-99.999 -X-36 -Y99 -X-34 -Y-99.999 -X-32 -Y99 -X-30 -Y-99.999 -X-28 -Y99 -X-26 -Y-99.999 -X-24 -Y99 -X-22 -Y-99.999 -X-20 -Y99 -X-18 -Y-99.999 -X-16 -Y99 -X-14 -Y-99.999 -X-12 -Y99 -X-10 -Y-99.999 -X-8 -Y99 -X-6 -Y-99.999 -X-4 -Y99 -X-2 -Y-99.999 -X0 -Y99 -X2 -Y-99.999 -X4 -Y99 -X6 -Y-99.999 -X8 -Y99 -X10 -Y-99.999 -X12 -Y99 -X14 -Y-99.999 -X16 -Y99 -X18 -Y-99.999 -X20 -Y99 -X22 -Y-99.999 -X24 -Y99 -X26 -Y-99.999 -X28 -Y99 -X30 -Y-99.999 -X32 -Y99 -X34 -Y-99.999 -X36 -Y99 -X38 -Y-99.999 -X40 -Y99 -X42 -Y-99.999 -X44 -Y99 -X46 -Y-99.999 -X48 -Y99 -X50 -Y-99.999 -X52 -Y99 -X54 -Y-99.999 -X56 -Y99 -X58 -Y-99.999 -X60 -Y99 -X62 -Y-99.999 -X64 -Y99 -X66 -Y-99.999 -X68 -Y99 -X70 -Y-99.999 -X72 -Y99 -X74 -Y-99.999 -X76 -Y99 -X78 -Y-99.999 -X80 -Y99 -X82 -Y-99.999 -X84 -Y99 -X86 -Y-99.999 -X88 -Y99 -X90 -Y-99.999 -X92 -Y99 -X94 -Y-99.999 -X96 -Y99 -X98 -Y-99.999 +X-66Y-17.999 +G1Z-6.1F500 +Y18F1000 G0Z2 -X-98 -G1Z-10F500 -Y99F1000 -X-96 -Y-99.999 -X-94 -Y99 -X-92 -Y-99.999 -X-90 -Y99 -X-88 -Y-99.999 -X-86 -Y99 -X-84 -Y-99.999 -X-82 -Y99 -X-80 -Y-99.999 -X-78 -Y99 -X-76 -Y-99.999 -X-74 -Y99 -X-72 -Y-99.999 -X-70 -Y99 -X-68 -Y-99.999 -X-66 -Y99 -X-64 -Y-99.999 -X-62 -Y99 -X-60 -Y-99.999 -X-58 -Y99 -X-56 -Y-99.999 -X-54 -Y99 -X-52 -Y-99.999 -X-50 -Y99 -X-48 -Y-99.999 -X-46 -Y99 -X-44 -Y-99.999 -X-42 -Y99 -X-40 -Y-99.999 -X-38 -Y99 -X-36 -Y-99.999 -X-34 -Y99 -X-32 -Y-99.999 -X-30 -Y99 -X-28 -Y-99.999 -X-26 -Y99 -X-24 -Y-99.999 +X-64Y24 +G1Z-6.1F500 +Y-23.999F1000 +G0Z2 +X-62Y-28.999 +G1Z-6.1F500 +Y29F1000 +X-60Y33 +Y-32.999 +X-58Y-35.999 +Y36 +X-56Y39 +Y-38.999 +X-54Y-41.999 +Y42 +X-52Y44 +Y-43.999 +X-50Y-45.999 +Y46 +X-48Y48 +Y-47.999 +X-46Y-49.999 +Y50 +X-44Y52 +Y-51.999 +X-42Y-53.999 +Y54 +X-40Y55 +Y-54.999 +X-38Y-55.999 +Y56 +X-36Y58 +Y-57.999 +X-34Y-58.999 +Y59 +X-32Y60 +Y-59.999 +X-30Y-60.999 +Y61 +X-28Y62 +Y-61.999 +X-26Y-62.999 +Y63 +X-24Y64 +Y-63.999 X-22 -Y99 -X-20 -Y-99.999 -X-18 -Y99 +Y64 +X-20Y65 +Y-64.999 +X-18Y-65.999 +Y66 X-16 -Y-99.999 -X-14 -Y99 +Y-65.999 +X-14Y-66.999 +Y67 X-12 -Y-99.999 +Y-66.999 X-10 -Y99 -X-8 -Y-99.999 +Y67 +X-8Y68 +Y-67.999 X-6 -Y99 +Y68 X-4 -Y-99.999 +Y-67.999 X-2 -Y99 +Y68 X0 -Y-99.999 +Y-67.999 X2 -Y99 +Y68 X4 -Y-99.999 +Y-67.999 X6 -Y99 +Y68 X8 -Y-99.999 -X10 -Y99 +Y-67.999 +X10Y-66.999 +Y67 X12 -Y-99.999 +Y-66.999 X14 -Y99 -X16 -Y-99.999 +Y67 +X16Y66 +Y-65.999 X18 -Y99 -X20 -Y-99.999 -X22 -Y99 +Y66 +X20Y65 +Y-64.999 +X22Y-63.999 +Y64 X24 -Y-99.999 -X26 -Y99 -X28 -Y-99.999 -X30 -Y99 -X32 -Y-99.999 -X34 -Y99 -X36 -Y-99.999 -X38 -Y99 -X40 -Y-99.999 -X42 -Y99 -X44 -Y-99.999 -X46 -Y99 -X48 -Y-99.999 -X50 -Y99 -X52 -Y-99.999 -X54 -Y99 -X56 -Y-99.999 -X58 -Y99 -X60 -Y-99.999 -X62 -Y99 -X64 -Y-99.999 -X66 -Y99 -X68 -Y-99.999 -X70 -Y99 -X72 -Y-99.999 -X74 -Y99 -X76 -Y-99.999 -X78 -Y99 -X80 -Y-99.999 -X82 -Y99 -X84 -Y-99.999 -X86 -Y99 -X88 -Y-99.999 -X90 -Y99 -X92 -Y-99.999 -X94 -Y99 -X96 -Y-99.999 -X98 -Y99 +Y-63.999 +X26Y-62.999 +Y63 +X28Y62 +Y-61.999 +X30Y-60.999 +Y61 +X32Y60 +Y-59.999 +X34Y-58.999 +Y59 +X36Y58 +Y-57.999 +X38Y-55.999 +Y56 +X40Y55 +Y-54.999 +X42Y-53.999 +Y54 +X44Y52 +Y-51.999 +X46Y-49.999 +Y50 +X48Y48 +Y-47.999 +X50Y-45.999 +Y46 +X52Y44 +Y-43.999 +X54Y-41.999 +Y42 +X56Y39 +Y-38.999 +X58Y-35.999 +Y36 +X60Y33 +Y-32.999 +X62Y-28.999 +Y29 +G0Z2 +X64Y24 +G1Z-6.1F500 +Y-23.999F1000 +G0Z2 +X66Y-17.999 +G1Z-6.1F500 +Y18F1000 +G0Z2 +X68Y8 +G1Z-6.1F500 +Y-7.999F1000 +G0Z2 +X-68 +G1Z-6.835F500 +Y8F1000 +G0Z2 +X-66Y18 +G1Z-6.835F500 +Y-17.999F1000 +G0Z2 +X-64Y-23.999 +G1Z-6.835F500 +Y24F1000 +G0Z2 +X-62Y29 +G1Z-6.835F500 +Y-28.999F1000 +X-60Y-32.999 +Y32 +Y33Z-6.82 +G0Z2 +X-58Y36 +G1Z-6.835F500 +Y-35.999F1000 +X-56Y-38.999 +Y39 +X-54Y42 +Y-41.999 +X-52Y-43.999 +Y44 +X-50Y46 +Y-45.999 +X-48Y-47.999 +Y48 +X-46Y50 +Y-49.999 +X-44Y-51.999 +Y52 +G0Z2 +X-42Y54 +G1Z-6.823F500 +Y53Z-6.835F1000 +Y-53.999 +X-40Y-54.999 +Y55 +X-38Y56 +Y-55.999 +X-36Y-57.999 +Y58 +X-34Y59 +Y-58.999 +X-32Y-59.999 +Y60 +X-30Y61 +Y-60.999 +X-28Y-61.999 +Y62 +X-26Y63 +Y-62.999 +X-24Y-63.999 +Y64 +X-22 +Y-63.999 +X-20Y-64.999 +Y65 +G0Z2 +X-18Y66 +G1Z-6.823F500 +Y65Z-6.835F1000 +Y-65.999 +X-16 +Y66 +G0Z2 +X-14Y67 +G1Z-6.823F500 +Y66Z-6.835F1000 +Y-66.999 +X-12 +Y67 +X-10 +Y-66.999 +X-8Y-67.999 +Y67 +Y68Z-6.823 +G0Z2 +X-6 +G1Z-6.835F500 +Y-67.999F1000 +X-4 +Y68 +X-2 +Y-67.999 +X0 +Y68 +X2 +Y-67.999 +X4 +Y68 +X6 +Y-67.999 +X8 +Y67 +Y68Z-6.823 +G0Z2 +X10Y67 +G1Z-6.835F500 +Y-66.999F1000 +X12 +Y67 +G0Z2 +X14 +G1Z-6.823F500 +Y66Z-6.835F1000 +Y-66.999 +X16Y-65.999 +Y66 +G0Z2 +X18 +G1Z-6.823F500 +Y65Z-6.835F1000 +Y-65.999 +X20Y-64.999 +Y65 +X22Y64 +Y-63.999 +X24 +Y64 +X26Y63 +Y-62.999 +X28Y-61.999 +Y62 +X30Y61 +Y-60.999 +X32Y-59.999 +Y60 +X34Y59 +Y-58.999 +X36Y-57.999 +Y58 +X38Y56 +Y-55.999 +X40Y-54.999 +Y55 +G0Z2 +X42Y54 +G1Z-6.823F500 +Y53Z-6.835F1000 +Y-53.999 +X44Y-51.999 +Y52 +X46Y50 +Y-49.999 +X48Y-47.999 +Y48 +X50Y46 +Y-45.999 +X52Y-43.999 +Y44 +G0Z2 +X54Y42 +G1Z-6.835F500 +Y41Z-6.835F1000 +Y-40.999 +Y-41.999Z-6.835 +G0Z2 +X56Y-38.999 +G1Z-6.835F500 +Y39F1000 +X58Y36 +Y-35.999 +G0Z2 +X60Y-32.999 +G1Z-6.835F500 +Y-31.999Z-6.835F1000 +Y32 +Y33Z-6.819 +G0Z2 +X62Y29 +G1Z-6.835F500 +Y28Z-6.835F1000 +Y-27.999 +Y-28.999Z-6.835 +G0Z2 +X64Y-23.999 +G1Z-6.835F500 +Y24F1000 +G0Z2 +X66Y18 +G1Z-6.835F500 +Y17Z-6.835F1000 +Y-16.999 +Y-17.999Z-6.835 +G0Z2 +X68Y-7.999 +G1Z-6.834F500 +Y-6.999Z-6.835F1000 +Y7 +Y8Z-6.834 G0Z2 diff --git a/scripts/addons/cam/tests/test_data/parallel/_Op_Parallel_Internal_Exact.gcode b/scripts/addons/cam/tests/test_data/parallel/_Op_Parallel_Internal_Exact.gcode index c17cd2c8..c4123a67 100644 --- a/scripts/addons/cam/tests/test_data/parallel/_Op_Parallel_Internal_Exact.gcode +++ b/scripts/addons/cam/tests/test_data/parallel/_Op_Parallel_Internal_Exact.gcode @@ -1,4 +1,4 @@ -(Created with grbl post processor 2024/01/13 06:54) +(Created with grbl post processor 2024/01/26 11:54) G21 (G-code generated with BlenderCAM and NC library) G17G90 @@ -19,7 +19,7 @@ G0Z2 X-66Y18 G1Z-0.702F500 Y17.605Z-3.1 -Y-16.597F1000 +Y-16.597Z-3.1F1000 Y-16.999Z-0.629 G0Z2 X-64Y-23.999 @@ -32,7 +32,7 @@ G0Z2 X-62Y29 G1Z-0.119F500 Y28.552Z-3.1 -Y-27.61F1000 +Y-27.61Z-3.1F1000 Y-27.999Z-0.762 G0Z2 X-60Y-31.999 @@ -49,7 +49,7 @@ G0Z2 X-56Y-38.999 G1Z-0.302F500 Y-38.567Z-3.1 -Y38.571F1000 +Y38.571Z-3.1F1000 Y39Z-0.348 G0Z2 X-54Y41 @@ -60,13 +60,13 @@ G0Z2 X-52Y-43.999 G1Z-0.528F500 Y-43.587Z-3.1 -Y43.59F1000 +Y43.59Z-3.1F1000 Y44Z-0.547 G0Z2 X-50Y46 G1Z-1.111F500 Y45.648Z-3.1 -Y-45.638F1000 +Y-45.638Z-3.1F1000 Y-45.999Z-1.025 G0Z2 X-48Y-47.999 @@ -76,7 +76,7 @@ G0Z2 X-46Y50 G1Z-1.027F500 Y49.639Z-3.1 -Y-49.646F1000 +Y-49.646Z-3.1F1000 Y-49.999Z-1.096 G0Z2 X-44Y-51.999 @@ -88,7 +88,7 @@ G0Z2 X-42Y54 G1Z-0.11F500 Y53.551Z-3.1 -Y-53.563F1000 +Y-53.563Z-3.1F1000 Y-53.999Z-0.264 G0Z2 X-40Y-54.999 @@ -105,7 +105,7 @@ G0Z2 X-36Y-57.999 G1Z-0.545F500 Y-57.589Z-3.1 -Y57.567F1000 +Y57.567Z-3.1F1000 Y58Z-0.302 G0Z2 X-34Y59 @@ -116,7 +116,7 @@ Y-58.999Z-1.043 G0Z2 X-32Y-59.999 G1Z-3.1F500 -Y59.619F1000 +Y59.619Z-3.1F1000 Y60Z-0.844 G0Z2 X-30Y61 @@ -130,18 +130,18 @@ G0Z2 X-26Y63 G1Z-0.581F500 Y62.593Z-3.1 -Y-62.999F1000 +Y-62.999Z-3.1F1000 G0Z2 X-24Y-63.999 G1Z-0.725F500 Y-63.606Z-3.1 -Y63.568F1000 +Y63.568Z-3.1F1000 Y64Z-0.314 G0Z2 X-22Y65 G1Z-0.102F500 Y64.55Z-3.1 -Y-64.575F1000 +Y-64.575Z-3.1F1000 Y-64.999Z-0.392 G0Z2 X-20Y-65.999 @@ -164,7 +164,7 @@ G0Z2 X-14Y67 G1Z-0.339F500 Y66.57Z-3.1 -Y-66.632F1000 +Y-66.632Z-3.1F1000 Y-66.999Z-0.972 G0Z2 X-12Y-67.999 @@ -181,7 +181,7 @@ G0Z2 X-8 G1Z-1.273F500 Y-67.667Z-3.1 -Y67.577F1000 +Y67.577Z-3.1F1000 Y68Z-0.416 G0Z2 X-6 @@ -194,7 +194,7 @@ G1Z-0.229F500 Y-68.56Z-3.1 Y68F1000 X-2 -Y-68.57 +Y-68.57Z-3.1 Y-68.999Z-0.338 G0Z2 X0 @@ -202,7 +202,7 @@ G1Z-0.339F500 Y-68.57Z-3.1 Y68F1000 X2 -Y-68.568 +Y-68.568Z-3.1 Y-68.999Z-0.312 G0Z2 X4 @@ -210,7 +210,7 @@ G1Z-0.244F500 Y-68.562Z-3.1 Y68F1000 X6 -Y-67.643 +Y-67.643Z-3.1 Y-67.999Z-1.068 Y-68.999Z-0.18 G0Z2 @@ -223,19 +223,19 @@ G0Z2 X10 G1Z-0.477F500 Y67.583Z-3.1 -Y-67.574F1000 +Y-67.574Z-3.1F1000 Y-67.999Z-0.381 G0Z2 X12 G1Z-0.218F500 Y-67.559Z-3.1 -Y67.558F1000 +Y67.558Z-3.1F1000 Y68Z-0.192 G0Z2 X14Y67 G1Z-1.253F500 Y66.665Z-3.1 -Y-66.59F1000 +Y-66.59Z-3.1F1000 Y-66.999Z-0.556 G0Z2 X16 @@ -247,7 +247,7 @@ G0Z2 X18Y66 G1Z-1.128F500 Y65.65Z-3.1 -Y-65.588F1000 +Y-65.588Z-3.1F1000 Y-65.999Z-0.532 Y-66.999Z-0.103 G0Z2 @@ -255,7 +255,7 @@ X20Y-65.999 G1Z-0.192F500 Y-64.999Z-1.25 Y-64.664Z-3.1 -Y65.574F1000 +Y65.574Z-3.1F1000 Y66Z-0.379 G0Z2 X22Y65 @@ -268,7 +268,7 @@ X24 G1Z-0.11F500 Y-63.999Z-0.497F1000 Y-63.584Z-3.1F500 -Y63.632F1000 +Y63.632Z-3.1F1000 Y64Z-0.967 Y65Z-0.17 G0Z2 @@ -283,7 +283,7 @@ X28Y-62.999 G1Z-0.166F500 Y-61.999Z-0.928 Y-61.627Z-3.1 -Y62.567F1000 +Y62.567Z-3.1F1000 Y63Z-0.301 G0Z2 X30Y62 @@ -297,14 +297,14 @@ X32Y-60.999 G1Z-0.163F500 Y-59.999Z-0.929 Y-59.628Z-3.1 -Y60.565F1000 +Y60.565Z-3.1F1000 Y61Z-0.282 G0Z2 X34Y60 G1Z-0.234F500 Y59Z-1.233 Y58.663Z-3.1 -Y-58.603F1000 +Y-58.603Z-3.1F1000 Y-58.999Z-0.687 Y-59.999Z-0.144 G0Z2 @@ -312,7 +312,7 @@ X36Y-58.999 G1Z-0.115F500 Y-57.999Z-0.433F1000 Y-57.578Z-3.1F500 -Y57.608F1000 +Y57.608Z-3.1F1000 Y58Z-0.74 Y59Z-0.174 G0Z2 @@ -320,7 +320,7 @@ X38Y58 G1Z-0.116F500 Y57Z-0.438F1000 Y56.579Z-3.1F500 -Y-56.562F1000 +Y-56.562Z-3.1F1000 Y-56.999Z-0.243 G0Z2 X40Y-55.999 @@ -335,14 +335,14 @@ X42Y55 G1Z-0.13F500 Y54Z-0.458F1000 Y53.581Z-3.1F500 -Y-53.563F1000 +Y-53.563Z-3.1F1000 Y-53.999Z-0.262 G0Z2 X44Y-52.999 G1Z-0.133F500 Y-51.999Z-0.53F1000 Y-51.587Z-3.1F500 -Y51.612F1000 +Y51.612Z-3.1F1000 Y52Z-0.777 Y53Z-0.185 G0Z2 @@ -350,7 +350,7 @@ X46Y51 G1Z-0.237F500 Y50Z-1.195 Y49.658Z-3.1 -Y-49.631F1000 +Y-49.631Z-3.1F1000 Y-49.999Z-0.964 Y-50.999Z-0.156 G0Z2 @@ -380,7 +380,7 @@ X54Y43 G1Z-0.124F500 Y42Z-0.295F1000 Y41.566Z-3.1F500 -Y-41.557F1000 +Y-41.557Z-3.1F1000 Y-41.999Z-0.184 Y-42.999Z-0.1 G0Z2 @@ -404,7 +404,7 @@ X60Y-33.999 G1Z-0.1F500 Y-32.999Z-0.153F1000 Y-32.554Z-3.1F500 -Y31.614F1000 +Y31.614Z-3.1F1000 Y32Z-0.795 Y33Z-0.203 Y34Z-0.118 @@ -414,7 +414,7 @@ G1Z-0.126F500 Y29Z-0.191F1000 Y28Z-0.676 Y27.602Z-3.1F500 -Y-28.554F1000 +Y-28.554Z-3.1F1000 Y-28.999Z-0.153 Y-29.999Z-0.109 G0Z2 @@ -422,7 +422,7 @@ X64Y-24.999 G1Z-0.123F500 Y-23.999Z-0.163F1000 Y-23.555Z-3.1F500 -Y22.618F1000 +Y22.618Z-3.1F1000 Y23Z-0.829 Y24Z-0.221 Y25Z-0.138 @@ -433,7 +433,7 @@ Y19Z-0.135F1000 Y18Z-0.169 Y17Z-0.448 Y16.58Z-3.1F500 -Y-17.554F1000 +Y-17.554Z-3.1F1000 Y-17.999Z-0.151 Y-18.999Z-0.124 G0Z2 @@ -465,7 +465,7 @@ G0Z2 X-64Y23.584 G1Z-3.1F500 Y23.106Z-6.1 -Y-22.115F1000 +Y-22.115Z-6.1F1000 Y-22.635Z-3.1 G0Z2 X-62Y-27.61 @@ -484,7 +484,7 @@ Y35.104F1000 Y35.571Z-3.1 X-56Y38.571 Y38.104Z-6.1F500 -Y-38.103F1000 +Y-38.103Z-6.1F1000 Y-38.567Z-3.1 G0Z2 X-54Y-41.552 @@ -495,7 +495,7 @@ G0Z2 X-52Y43.59 G1Z-3.1F500 Y43.107Z-6.1 -Y-43.107F1000 +Y-43.107Z-6.1F1000 Y-43.587Z-3.1 G0Z2 X-50Y-45.638 @@ -527,7 +527,7 @@ Y53.1F1000 Y53.551Z-3.1 X-40Y54.609 Y54.111Z-6.1F500 -Y-54.118F1000 +Y-54.118Z-6.1F1000 Y-54.651Z-3.1 X-38Y-56.56 Y-56.102Z-6.1F500 @@ -554,7 +554,7 @@ Y60.114 Y60.625Z-3.1 X-28Y61.615 Y61.112Z-6.1F500 -Y-61.999F1000 +Y-61.999Z-6.1F1000 X-26Y-62.999 Y62.108 Y62.593Z-3.1 @@ -562,13 +562,13 @@ G0Z2 X-24Y63.568 G1Z-3.1F500 Y63.103Z-6.1 -Y-63.11F1000 +Y-63.11Z-6.1F1000 Y-63.606Z-3.1 G0Z2 X-22Y-64.575 G1Z-3.1F500 Y-64.104Z-6.1 -Y64.1F1000 +Y64.1Z-6.1F1000 Y64.55Z-3.1 G0Z2 X-20Y64.647 @@ -600,7 +600,7 @@ G0Z2 X-10Y-67.587 G1Z-3.1F500 Y-67.107Z-6.1 -Y67.101F1000 +Y67.101Z-6.1F1000 Y67.553Z-3.1 G0Z2 X-8Y67.577 @@ -667,7 +667,7 @@ Y-66.102F1000 Y-66.562Z-3.1 X18Y-65.588 Y-65.107Z-6.1F500 -Y65.118F1000 +Y65.118Z-6.1F1000 Y65.65Z-3.1 X20Y65.574 Y65.104Z-6.1F500 @@ -677,7 +677,7 @@ G0Z2 X22Y-64.569 G1Z-3.1F500 Y-64.103Z-6.1 -Y64.109F1000 +Y64.109Z-6.1F1000 Y64.599Z-3.1 X24Y63.632 Y63.115Z-6.1F500 @@ -737,7 +737,7 @@ Y-51.107F1000 Y-51.587Z-3.1 X46Y-49.631 Y-49.115Z-6.1F500 -Y49.12F1000 +Y49.12Z-6.1F1000 Y49.658Z-3.1 X48Y48.564 Y48.103Z-6.1F500 @@ -951,7 +951,7 @@ Y68F1000 X-2 Y-67.999 Y-68.103Z-6.1 -X0 +X0Y-68.103 Y-67.999Z-6.769F500 Y68F1000 X2