.

Merge branch 'master' of github.com:daid/SkeinPyPy

Conflicts:
	SkeinPyPy_NewUI/skeinforge_application/alterations/end.gcode
	SkeinPyPy_NewUI/skeinforge_application/alterations/start.gcode

diff --git a/SkeinPyPy_NewUI/skeinforge_application/alterations/end.gcode b/SkeinPyPy_NewUI/skeinforge_application/alterations/end.gcode
index 912ed447a94fb055879e6e391ed3ba418cb72194..7d83d9b91d5ea334f6ee0f2f52a6fe9464d1cb22 100644 (file)
--- a/SkeinPyPy_NewUI/skeinforge_application/alterations/end.gcode
+++ b/SkeinPyPy_NewUI/skeinforge_application/alterations/end.gcode
@@ -5,4 +5,3 @@ G1 Z+10 E-5 F400       ;move Z up a bit and retract filament by 5mm
 G28 X0 Y0              ;move X/Y to min endstops, so the head is out of the way
 M84                    ;steppers off
 G90                    ;absolute positioning
-

diff --git a/SkeinPyPy_NewUI/skeinforge_application/alterations/start.gcode b/SkeinPyPy_NewUI/skeinforge_application/alterations/start.gcode
deleted file mode 100644 (file)
index 1ccaadc..0000000
--- a/SkeinPyPy_NewUI/skeinforge_application/alterations/start.gcode
+++ /dev/null
@@ -1,24 +0,0 @@
-G21        ;metric values
-G90        ;absolute positioning
-G21
-G28 X0 Y0  ;move X/Y to min endstops
-G28 Z0     ;move Z to min endstops
-
-; if your prints start too high, try changing the Z0.0 below
-; to Z1.0 - the number after the Z is the actual, physical
-; height of the nozzle in mm. This can take some messing around
-; with to get just right... 
-G92 X0 Y0 Z0 E0 ;reset software position to front/left/z=0.0
-G21
-G1 Z15.0 F400  ;move the platform down 15mm
-G92 E0         ;zero the extruded length
-G21
-G1 F75 E5     ;extrude 5mm of feed stock
-G1 F75 E3.5   ;reverse feed stock by 1.5mm
-G92 E0         ;zero the extruded length again
-G21
-M1             ;Clean the nozzle then press YES to continue...
-G21
-G1 X100 Y100 F3500 ;go to the middle of the platform
-G1 Z0.0 F400   ;back to Z=0 and start the print!
-