size-tests: break out size_tests

[reprap-play.git] / size-tests.m-g

diff --git a/size-tests.m-g b/size-tests.m-g
index 57d98c4d5795a78448086abb60eac811d889ca11..48a3a17e7e8f544a0f38960e3af81d5ed50c3a06 100644 (file)
--- a/size-tests.m-g
+++ b/size-tests.m-g
@@ -24,7 +24,7 @@ G21 ; set units to millimeters
 G92 E0
 M82 ; use absolute distances for extrusion
 
-!zprint=0.4
+!zprint=0.3
 
 ; "skirt" - prep extruder
 !draw 5,5 100,5 101,5.5 101,6.0 100,6.5 5,6.5
@@ -65,9 +65,28 @@ M82 ; use absolute distances for extrusion
  !draw @0.500,@0.500 @4.500,@0.500 @4.500,@19.500 @0.500,@19.500 @0.500,@0.500
 !}
 
-!layer(){
+!org_oblong(){
+; original test oblong
 
-;--------------------
+!draw 68.498,79.498 \
+71.502,79.498 \
+71.502,82.502 \
+68.498,82.502 \
+68.498,79.588 \
+*67.899,78.899 \
+72.101,78.899 \
+72.101,83.101 \
+67.899,83.101 \
+67.899,78.989 \
+*67.300,78.300 \
+72.700,78.300 \
+72.700,83.700 \
+67.300,83.700 \
+67.300,78.390 \
+
+!}
+
+!squares_tests(){
 
 !orgy=40
 
@@ -114,23 +133,14 @@ M82 ; use absolute distances for extrusion
 !orgx=30
 !inner_longrect()
 
-; original test oblong
+!}
 
-!draw 68.498,79.498 \
-71.502,79.498 \
-71.502,82.502 \
-68.498,82.502 \
-68.498,79.588 \
-*67.899,78.899 \
-72.101,78.899 \
-72.101,83.101 \
-67.899,83.101 \
-67.899,78.989 \
-*67.300,78.300 \
-72.700,78.300 \
-72.700,83.700 \
-67.300,83.700 \
-67.300,78.390 \
+!layer(){
+
+;--------------------
+
+!squares_tests()
+!org_oblong()
 
 !}
 
@@ -139,7 +149,7 @@ M82 ; use absolute distances for extrusion
 M104 S210 ; set temperature
 M140 S60 ; set bed temperature
 
-!zprint=0.8
+!zprint=0.7
 !layer()
 
 M83 ; extruder relative