X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=size-tests.m-g;h=fbb666b9560dd262dd334399c05d2a39c9517975;hp=57d98c4d5795a78448086abb60eac811d889ca11;hb=fbda336643dfb1929a1298531d3d096dfad7a50d;hpb=9bf0fb85132ec073d474ee64bdd513c4002a87e1

diff --git a/size-tests.m-g b/size-tests.m-g
index 57d98c4..fbb666b 100644
--- 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,62 @@ 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 \
+!feedrate_tests(){
+
+!orgx=20
+!extruderate=0.045
+!feedrate_test1()
+
+!orgx=30
+!extruderate=0.060
+!feedrate_test1()
+
+!orgx=40
+!extruderate=0.080
+!feedrate_test1()
+
+!orgx=50
+!extruderate=0.100
+!feedrate_test1()
+
+!orgx=60
+!extruderate=0.125
+!feedrate_test1()
+
+!orgx=70
+!extruderate=0.150
+!feedrate_test1()
+
+!orgx=80
+!extruderate=0.200
+!feedrate_test1()
+
+!}
+
+!feedrate_test1(){
+
+!orgy=20
+!outer_longrect()
+
+!orgy=50
+!inner_longrect()
+!outer_longrect()
+
+!orgy=80
+!outer_longrect()
+!inner_longrect()
+
+!}
+
+!layer(){
+
+;--------------------
+
+;!squares_tests()
+;!org_oblong()
+!feedrate_tests()
 
 !}
 
@@ -139,7 +197,10 @@ M82 ; use absolute distances for extrusion
 M104 S210 ; set temperature
 M140 S60 ; set bed temperature
 
-!zprint=0.8
+!zprint=0.7
+!layer()
+
+!zprint=1.1
 !layer()
 
 M83 ; extruder relative