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=30667fd4cf4f8ff6d6883a5380c389e4effaf5f9;hb=90baca918b9b76a8912a190b8f1c2da7566739f4;hpb=5fdc3fd6d60f4c345fda8cd777213eced3ecf666

diff --git a/size-tests.m-g b/size-tests.m-g
index 30667fd..fbb666b 100644
--- a/size-tests.m-g
+++ b/size-tests.m-g
@@ -24,11 +24,50 @@ G21 ; set units to millimeters
 G92 E0
 M82 ; use absolute distances for extrusion
 
-!zprint=0.4
+!zprint=0.3
 
-!draw 10,10 100,10 102,12 102,14 100,16 10,16
+; "skirt" - prep extruder
+!draw 5,5 100,5 101,5.5 101,6.0 100,6.5 5,6.5
+
+; edge ticks for global motions sizing
+
+!edge_ticks(){
+!draw 20,10 10,10 10,20
+!draw 10,65 10,75
+!draw 10,120 10,130 20,130
+!draw 65,130 75,130
+!draw 120,130 130,130 130,120
+!draw 130,75 130,65
+!draw 130,20 130,10 120,10
+!draw 75,10 65,10
+!}
+
+;!edge_ticks()
+
+!outer_square(){
+ !draw @0.000,@0.000 @5.000,@0.000 @5.000,@5.000 @0.000,@5.000 @0.000,@0.000
+!}
+!inner_square(){
+ !draw @0.500,@0.500 @4.500,@0.500 @4.500,@4.500 @0.500,@4.500 @0.500,@0.500
+!}
+!outer_vlines(){
+ !draw @0.000,@0.000 @0.000,@5.000
+ !draw @5.000,@0.000 @5.000,@5.000
+!}
+!inner_vlines(){
+ !draw @0.500,@0.500 @0.500,@4.500
+ !draw @4.500,@0.500 @4.500,@4.500
+!}
+!outer_longrect(){
+ !draw @0.000,@0.000 @5.000,@0.000 @5.000,@20.000 @0.000,@20.000 @0.000,@0.000
+!}
+!inner_longrect(){
+ !draw @0.500,@0.500 @4.500,@0.500 @4.500,@19.500 @0.500,@19.500 @0.500,@0.500
+!}
+
+!org_oblong(){
+; original test oblong
 
-!layer(){
 !draw 68.498,79.498 \
 71.502,79.498 \
 71.502,82.502 \
@@ -47,20 +86,128 @@ M82 ; use absolute distances for extrusion
 
 !}
 
+!squares_tests(){
+
+!orgy=40
+
+!orgx=30
+!outer_longrect()
+
+!orgx=50
+!inner_longrect()
+!outer_longrect()
+
+!orgx=90
+!inner_square()
+!outer_square()
+
+!orgx=110
+!outer_square()
+
+!orgy=60
+!outer_vlines()
+
+!orgx=90
+!inner_vlines()
+!outer_vlines()
+
+!orgy=80
+!outer_square()
+!inner_square()
+
+!orgx=110
+!inner_square()
+
+!orgy=100
+!inner_vlines()
+
+!orgx=90
+!outer_vlines()
+!inner_vlines()
+
+!orgx=50
+!orgy=80
+!outer_longrect()
+!inner_longrect()
+
+!orgx=30
+!inner_longrect()
+
+!}
+
+!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()
+
+!}
+
 !layer()
 
 M104 S210 ; set temperature
 M140 S60 ; set bed temperature
 
-!zprint=0.8
+!zprint=0.7
+!layer()
+
+!zprint=1.1
 !layer()
 
 M83 ; extruder relative
 G1 F1000 ;1000mm/min extrusion
 G1 E-10; retract
-G1 F240 ;240mm/min vertical move
-G1 Z70
-G28 X0 Y0 ; home X and Y axis
+G1 X0 Y0 F10000
+G28 X0 Y0
 M104 S0 ; turn off temperature
 M140 S0 ; turn off bed
 M84     ; disable motors